diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-05-27 10:29:03 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-05-27 10:29:03 +0000 |
| commit | 883035fb84bb2fcec9c9971e7fb20db07d4254bd (patch) | |
| tree | 88090bc5954e1b642d6c0cac34dbebf672619107 /eclass | |
| parent | Stable for amd64, wrt bug #549016 (diff) | |
| download | gentoo-2-883035fb84bb2fcec9c9971e7fb20db07d4254bd.tar.gz gentoo-2-883035fb84bb2fcec9c9971e7fb20db07d4254bd.tar.bz2 gentoo-2-883035fb84bb2fcec9c9971e7fb20db07d4254bd.zip | |
when munging the libtool paths, make sure we use the internal multilib path and not the main libpath #540392 by Christoph Junghans
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 9eb036e1bb1e..066f3c9f28f2 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.671 2015/05/26 08:32:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.672 2015/05/27 10:29:03 vapier Exp $ # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -1818,9 +1818,11 @@ gcc_movelibs() { # -are-, and not where they -used- to be. also, any dependencies we have # on our own .la files need to be updated. fix_libtool_libdir_paths() { + local libpath="$1" + pushd "${D}" >/dev/null - pushd "./${1}" >/dev/null + pushd "./${libpath}" >/dev/null local dir="${PWD#${D%/}}" local allarchives=$(echo *.la) allarchives="\(${allarchives// /\\|}\)" @@ -1832,9 +1834,9 @@ fix_libtool_libdir_paths() { # Would be nice to combine these, but -maxdepth can not be specified # on sub-expressions. find "./${PREFIX}"/lib* -maxdepth 3 -name '*.la' \ - -exec sed -i -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" {} + || die + -exec sed -i -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${libpath}/\1:g" {} + || die find "./${dir}/" -maxdepth 1 -name '*.la' \ - -exec sed -i -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" {} + || die + -exec sed -i -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${libpath}/\1:g" {} + || die popd >/dev/null } |