diff options
| author |   Dominik Kapusta <ayoy@gentoo.org> | 2009-11-15 16:46:49 +0000 |
|---|---|---|
| committer | Dominik Kapusta <ayoy@gentoo.org> | 2009-11-15 16:46:49 +0000 |
| commit | e397f56b717f28c346672d9cd7f20e7a24cf4273 (patch) | |
| tree | 877edd2a0e5eb12a3451b3246450f17c9ed35532 /dev-embedded | |
| parent | Add support brief output mode for bug #292097 (diff) | |
| download | historical-e397f56b717f28c346672d9cd7f20e7a24cf4273.tar.gz historical-e397f56b717f28c346672d9cd7f20e7a24cf4273.tar.bz2 historical-e397f56b717f28c346672d9cd7f20e7a24cf4273.zip | |
Fixed LDPATH
Package-Manager: portage-2.2_rc49/cvs/Linux x86_64
Diffstat (limited to 'dev-embedded')
| -rw-r--r-- | dev-embedded/scratchbox/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-embedded/scratchbox/Manifest | 12 | ||||
| -rw-r--r-- | dev-embedded/scratchbox/scratchbox-2.0.ebuild | 20 |
3 files changed, 26 insertions, 11 deletions
diff --git a/dev-embedded/scratchbox/ChangeLog b/dev-embedded/scratchbox/ChangeLog index 27b0cf9dcde3..0f8d4806d26b 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.8 2009/10/16 17:23:16 ayoy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox/ChangeLog,v 1.9 2009/11/15 16:46:49 ayoy Exp $ + + 15 Nov 2009; Dominik Kapusta <ayoy@gentoo.org> scratchbox-2.0.ebuild: + Fixed LDPATH 16 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> scratchbox-2.0.ebuild: Fixed to avoid possible distcc issues diff --git a/dev-embedded/scratchbox/Manifest b/dev-embedded/scratchbox/Manifest index 60c07e64dab8..4672bd835385 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 1157 RMD160 05bba1aab70652fd7f965c35c77b9473476bdd0e SHA1 4aed4bffd9ddcb01e1b2a8a0f82f68c8effee87c SHA256 dee8ecc64b4c63bb589f382b370fc8082524b8fef78f5fafea2ddaef2c660c81 -MISC ChangeLog 1441 RMD160 cafbb1579a2f385491de2daf710f5d5b7efaef03 SHA1 571ae7ddc03a5ecf8525036bb684795065108cd0 SHA256 b03dd659268c2dabe1da68c5926e0fb301985a57dac2ec8636fc100e53bcf007 +EBUILD scratchbox-2.0.ebuild 1415 RMD160 e6039843fe815c53519e67bebe1e04a982986fa3 SHA1 859d21eb4bb00d81af80d783f66f9739c615693a SHA256 85eaf62f81d381569e2276d98638b62df8a6b96afbb8033a88202792ee336ba3 +MISC ChangeLog 1529 RMD160 6aaed461bf34960bbc5a3b556782c17657f91def SHA1 c69d6c6551e6c0a2b058cf6c05d0896faec2b9ee SHA256 425294f94ad3599924d656506b14e1b531d0bdd01bfcbdee4b1067da73f4abea MISC metadata.xml 226 RMD160 fbf9cef5397add3596a11d471e8977cef5fe798a SHA1 10d67f7d4544776c6c508dfe6c15eea8aca03d6b SHA256 37816e1cc9c8450fa0ffd3c1a129be4ca5cda12748598b16b6d3a3e1250fef4a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.13 (GNU/Linux) -iEYEARECAAYFAkrYrA4ACgkQ+CZEqwt+F6YyBACcCKqj4Mzsw5JHeHpXZK/QnRfx -ejIAnjSZvjFkOy4Vg/Uvi0tehpgoXMls -=TKgs +iEUEARECAAYFAksAMIMACgkQ+CZEqwt+F6ZxbgCeMsM29Ar3/WFYoFiL4LfcUHvf +sNoAl2GfzyPIzd345WQEYS++JYpFMvs= +=TGYi -----END PGP SIGNATURE----- diff --git a/dev-embedded/scratchbox/scratchbox-2.0.ebuild b/dev-embedded/scratchbox/scratchbox-2.0.ebuild index 4a184814c83a..976ffb818524 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.3 2009/10/16 17:23:16 ayoy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox/scratchbox-2.0.ebuild,v 1.4 2009/11/15 16:46:49 ayoy Exp $ EAPI="2" -inherit autotools eutils toolchain-funcs +inherit autotools eutils multilib toolchain-funcs MY_PN="${PN/cratch}2" MY_P="${MY_PN}-${PV}" @@ -28,8 +28,8 @@ src_prepare() { epatch "${FILESDIR}/${P}-gentoo.patch" sed -e "s/^\(CC = \).*/\1$(tc-getCC)/" \ - -e "s/^\(CXX = \).*/\1$(tc-getCXX)/" \ - -e "s/^\(LD = \).*/\1$(tc-getLD)/" \ + -e "s/^\(CXX = \).*/\1$(tc-getCXX)/" \ + -e "s/^\(LD = \).*/\1$(tc-getLD)/" \ -i Makefile || die "sed Makefile failed" eautoreconf @@ -41,5 +41,17 @@ src_compile() { src_install() { emake INSTALL_ROOT="${D}" install || die "emake install failed" + + # List all the multilib libdirs + local libdirs= + for libdir in $(get_all_libdirs); do + libdirs="${libdirs}:/usr/${libdir}/libsb2" + done + + cat <<-EOF > "${T}/55scratchbox2" + LDPATH=${libdirs:1} + EOF + doenvd "${T}/55scratchbox2" || die "doenvd failed" + dodoc AUTHORS README || die "dodoc failed" } |