summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Kapusta <ayoy@gentoo.org>2009-10-16 17:23:16 +0000
committerDominik Kapusta <ayoy@gentoo.org>2009-10-16 17:23:16 +0000
commit5bf18257e32b530372b0a4b048f640a70c719cfa (patch)
treeac1023bf86a73488e4d191551c1dfdfb3d7976bb /dev-embedded/scratchbox
parentVersion bump (diff)
downloadhistorical-5bf18257e32b530372b0a4b048f640a70c719cfa.tar.gz
historical-5bf18257e32b530372b0a4b048f640a70c719cfa.tar.bz2
historical-5bf18257e32b530372b0a4b048f640a70c719cfa.zip
Fixed to avoid possible distcc issues
Package-Manager: portage-2.2_rc46/cvs/Linux x86_64
Diffstat (limited to 'dev-embedded/scratchbox')
-rw-r--r--dev-embedded/scratchbox/ChangeLog5
-rw-r--r--dev-embedded/scratchbox/Manifest10
-rw-r--r--dev-embedded/scratchbox/scratchbox-2.0.ebuild10
3 files changed, 17 insertions, 8 deletions
diff --git a/dev-embedded/scratchbox/ChangeLog b/dev-embedded/scratchbox/ChangeLog
index b6bd273e8d9d..27b0cf9dcde3 100644
--- a/dev-embedded/scratchbox/ChangeLog
+++ b/dev-embedded/scratchbox/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-embedded/scratchbox
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox/ChangeLog,v 1.7 2009/10/16 16:55:51 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox/ChangeLog,v 1.8 2009/10/16 17:23:16 ayoy Exp $
+
+ 16 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> scratchbox-2.0.ebuild:
+ Fixed to avoid possible distcc issues
16 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> scratchbox-2.0.ebuild:
Keywording for x86
diff --git a/dev-embedded/scratchbox/Manifest b/dev-embedded/scratchbox/Manifest
index 1d745fb5ad4a..60c07e64dab8 100644
--- a/dev-embedded/scratchbox/Manifest
+++ b/dev-embedded/scratchbox/Manifest
@@ -11,13 +11,13 @@ DIST scratchbox-libs-1.0.11-i386.tar.gz 14346917 RMD160 d14222e624394b44d3fa18d5
DIST scratchbox-libs-1.0.16-i386.tar.gz 14291765 RMD160 0496f9362a5fef2e348136c3184a784d9adefd1e SHA1 633c3171c256707cf99288b167e80e73198a4c37 SHA256 9f07255bccf03acfb28fd883238fea58ba8b60becde48a57e9da3a5444008ee8
EBUILD scratchbox-1.0.11.ebuild 3007 RMD160 f2ee84191c46896d4f4f1a1af323d3618b892e9b SHA1 9dce8ddb3878ff0f8e957706b193f5717979c1fc SHA256 eecaba41dff5ba419c8cc827d44e67958c057c4e6b52beb52e657910c0f95a76
EBUILD scratchbox-1.0.16.ebuild 2709 RMD160 aa3431bb64063e5b8bf1bd47d0c887361034f0a3 SHA1 af72569dc56d8a9b0c5a0f411c7669cb42e59391 SHA256 ec9a06ebd08bd8db317d6c21c5f01db03e6af67657b7e9a8c41f9b4a958714d6
-EBUILD scratchbox-2.0.ebuild 968 RMD160 f256e69ca28debe26f9bc94e4ffe63e71accfed1 SHA1 c9ee5549aba775adeabdc22200d10a44f4d086c9 SHA256 e25fce675c5d5ef1e3d193e74d424f733f5f4a75699c30ddc9e940dd89459a3d
-MISC ChangeLog 1328 RMD160 e1728d77a82165e2941510fa3f5605a74c8bfb35 SHA1 739bb2ae761154a396bf81a871fde54bbf8ec128 SHA256 2647a86935b7cddbe94c0c8250a4af164c70b1c66ef99070cb83257375fd62dd
+EBUILD scratchbox-2.0.ebuild 1157 RMD160 05bba1aab70652fd7f965c35c77b9473476bdd0e SHA1 4aed4bffd9ddcb01e1b2a8a0f82f68c8effee87c SHA256 dee8ecc64b4c63bb589f382b370fc8082524b8fef78f5fafea2ddaef2c660c81
+MISC ChangeLog 1441 RMD160 cafbb1579a2f385491de2daf710f5d5b7efaef03 SHA1 571ae7ddc03a5ecf8525036bb684795065108cd0 SHA256 b03dd659268c2dabe1da68c5926e0fb301985a57dac2ec8636fc100e53bcf007
MISC metadata.xml 226 RMD160 fbf9cef5397add3596a11d471e8977cef5fe798a SHA1 10d67f7d4544776c6c508dfe6c15eea8aca03d6b SHA256 37816e1cc9c8450fa0ffd3c1a129be4ca5cda12748598b16b6d3a3e1250fef4a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkrYpaQACgkQ+CZEqwt+F6Z1vQCdH2wxeElC+57k1L79h8TUETQO
-JH4An3GKpxzfz8O2g6BJy0IMFMKfMK28
-=1fRH
+iEYEARECAAYFAkrYrA4ACgkQ+CZEqwt+F6YyBACcCKqj4Mzsw5JHeHpXZK/QnRfx
+ejIAnjSZvjFkOy4Vg/Uvi0tehpgoXMls
+=TKgs
-----END PGP SIGNATURE-----
diff --git a/dev-embedded/scratchbox/scratchbox-2.0.ebuild b/dev-embedded/scratchbox/scratchbox-2.0.ebuild
index e643ac96deb3..4a184814c83a 100644
--- a/dev-embedded/scratchbox/scratchbox-2.0.ebuild
+++ b/dev-embedded/scratchbox/scratchbox-2.0.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox/scratchbox-2.0.ebuild,v 1.2 2009/10/16 16:55:51 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox/scratchbox-2.0.ebuild,v 1.3 2009/10/16 17:23:16 ayoy Exp $
EAPI="2"
-inherit autotools eutils
+inherit autotools eutils toolchain-funcs
MY_PN="${PN/cratch}2"
MY_P="${MY_PN}-${PV}"
@@ -26,6 +26,12 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}/${P}-glibc-2.10.patch"
epatch "${FILESDIR}/${P}-gentoo.patch"
+
+ sed -e "s/^\(CC = \).*/\1$(tc-getCC)/" \
+ -e "s/^\(CXX = \).*/\1$(tc-getCXX)/" \
+ -e "s/^\(LD = \).*/\1$(tc-getLD)/" \
+ -i Makefile || die "sed Makefile failed"
+
eautoreconf
}