need to rewrite dependency_libs lines in all .la files #125728

1 files changed, 16 insertions, 11 deletions

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 9ab0308513bb..89a93f8333da 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.386 2009/01/28 21:01:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.387 2009/01/28 23:40:38 vapier Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 
@@ -1929,7 +1929,7 @@ gcc_movelibs() {
 	done
 	find "${D}" -type d | xargs rmdir >& /dev/null
 
-	fix_libtool_libdir_paths $(find "${D}"${LIBPATH} -name *.la)
+	fix_libtool_libdir_paths
 }
 
 #----<< src_* >>----
@@ -2449,16 +2449,21 @@ disable_multilib_libjava() {
 # -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 dirpath allarchives="${@##*/}"
+	pushd "${D}" >/dev/null
+
+	local dir=${LIBPATH}
+	local allarchives=$(cd ./${dir}; echo *.la)
 	allarchives="\(${allarchives// /\\|}\)"
-	for archive in "$@" ; do
-		dirpath=${archive%/*}
-		dirpath=${dirpath#${D}}
-		sed -i \
-			-e "/^libdir=/s:=.*:='${dirpath}':" \
-			-e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${dirpath}/\1:g" \
-			"${archive}"
-	done
+
+	sed -i \
+		-e "/^libdir=/s:=.*:='${dir}':" \
+		./${dir}/*.la
+	sed -i \
+		-e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" \
+		$(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \
+		./${dir}/*.la
+
+	popd >/dev/null
 }
 
 is_multilib() {