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 | 950d13837c1999547fcdfe0d505232fbf3b44db3 (patch) | |
| tree | 3154b223a22fb9e20fb34dd73ec734225f24f497 /dev-embedded | |
| parent | Add support brief output mode for bug #292097 (diff) | |
| download | gentoo-2-950d13837c1999547fcdfe0d505232fbf3b44db3.tar.gz gentoo-2-950d13837c1999547fcdfe0d505232fbf3b44db3.tar.bz2 gentoo-2-950d13837c1999547fcdfe0d505232fbf3b44db3.zip | |
Fixed LDPATH
(Portage version: 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/scratchbox-2.0.ebuild | 20 |
2 files changed, 20 insertions, 5 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/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" } |