From abec94156062c976c2f9af7b16de12c020a9393b Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 8 Sep 2009 02:48:46 +0000
Subject: fix by Peter Alfredsen for libdir tweaking in multilib .la files
 #283761

---
 eclass/toolchain.eclass | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'eclass/toolchain.eclass')

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index bc2ddb6fb1f5..01ac977a5f38 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.406 2009/08/26 21:47:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.407 2009/09/08 02:48:46 vapier Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 
@@ -1966,6 +1966,7 @@ gcc_movelibs() {
 				fi
 			fi
 		done
+		fix_libtool_libdir_paths "${LIBPATH}/${MULTIDIR}"
 	done
 
 	# We remove directories separately to avoid this case:
@@ -1976,8 +1977,6 @@ gcc_movelibs() {
 		rmdir "${D}"${FROMDIR} >& /dev/null
 	done
 	find "${D}" -type d | xargs rmdir >& /dev/null
-
-	fix_libtool_libdir_paths
 }
 
 #----<< src_* >>----
@@ -2483,9 +2482,11 @@ disable_multilib_libjava() {
 fix_libtool_libdir_paths() {
 	pushd "${D}" >/dev/null
 
-	local dir=${LIBPATH}
-	local allarchives=$(cd ./${dir}; echo *.la)
+	pushd "${1}" >/dev/null
+	local dir="${PWD#${D}}"
+	local allarchives=$(echo *.la)
 	allarchives="\(${allarchives// /\\|}\)"
+	popd >/dev/null
 
 	sed -i \
 		-e "/^libdir=/s:=.*:='${dir}':" \
-- 
cgit v1.2.3-65-gdbad