[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass

[Mike Frysinger (vapier)]

vapier      09/09/08 02:48:46

  Modified:             toolchain.eclass
  Log:
  fix by Peter Alfredsen for libdir tweaking in multilib .la files #283761

Revision  Changes    Path
1.407                eclass/toolchain.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.407&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.407&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.406&r2=1.407

Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- toolchain.eclass	26 Aug 2009 21:47:56 -0000	1.406
+++ toolchain.eclass	8 Sep 2009 02:48:46 -0000	1.407
@@ -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@g.o>
 
@@ -1966,6 +1966,7 @@
 				fi
 			fi
 		done
+		fix_libtool_libdir_paths "${LIBPATH}/${MULTIDIR}"
 	done
 
 	# We remove directories separately to avoid this case:
@@ -1976,8 +1977,6 @@
 		rmdir "${D}"${FROMDIR} >& /dev/null
 	done
 	find "${D}" -type d | xargs rmdir >& /dev/null
-
-	fix_libtool_libdir_paths
 }
 
 #----<< src_* >>----
@@ -2483,9 +2482,11 @@
 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}':" \