Improve libdir detection for Prefix platforms, in particular Solaris, bug #427072

Package-Manager: portage-2.2.01.20837-prefix/cvs/Darwin i386

2 files changed, 12 insertions, 13 deletions

diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 5c259c2db518..946d7c892fd8 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -5,7 +5,7 @@ AUX eblits/common-v50160001.eblit 1578 SHA256 431f30795dcfaaddc6c33aeeb13437c6ef
 AUX eblits/pkg_postinst-v50160001.eblit 2603 SHA256 bfab0992a63ad1238ca22c6ba5fe17b53cfe3b02fd8fdebe156afe888865a8f4 SHA512 b95e39f8669c33cab0d750e2e8160bff7c2e878812e048b01b207d50355b719aeacf0816c048034b848ba2739db827001b4504b25c46b825f3275e282930c46f WHIRLPOOL d740d910169757025a1fc6f160662ba40bd0c04c646cc1dea4b22db5ff3173ad9d5e45ae627d49a258674f1684c9f7ac07c508f39b7bbd1f152e74e992af398b
 AUX eblits/pkg_postrm-v50160001.eblit 414 SHA256 838cf6fc5109410344f51019aa80377be35e466bc6515625475821bcce96dec2 SHA512 702d8dfe508959f3fa0f74d949913f61d3d167c0c30a924b4e08080eb76f7e28b2ad4c46ccbdaf93a2e493400a033f7b9f6ffe8d7ccc0a02b0c9508241cd7c87 WHIRLPOOL 44a9d0087a4dda3281399f11af0d1c0cba7c416fadb1102f02b54d80f180fc7e19a968545fc099619140b06242bfe65dd0baaa150f0553e7c79c5a1c709ead4a
 AUX eblits/pkg_setup-v50160001.eblit 2448 SHA256 1259e0d4addfb0f06aa322429e65cc9a60f5cfd16f24f43fc53ea3fe4550980e SHA512 d7446269bd36359d089f740ceb6dbf77b88ebe6c80e797444b7c89bbfa9dc32f503ac3ad356c35b3744be27d92bf33ccebdcde09ce969d10fe995d1e4cfc65fd WHIRLPOOL 66e141273fb16120e71a60f23149cbee6248733f3331cd110521a62120e51a1c650a1839720a8d31deb0477b817c5d565c152fd4974f2d4a07041981e932f355
-AUX eblits/src_configure-v50160001.eblit 4608 SHA256 e397b0eeab9d2b5c98ab82b05065188022b544e72a795da0cffc2f4c35d19afb SHA512 991cd4e27a0ac4671102c423b2606ea180c97ecfabaefb886799e9fa3d43ae553829f0129ff001cfa981031cfd496e43be90c94dab7f6db97cf4bf4ee7f6657e WHIRLPOOL c842559eab7e32d76aa66e828e6ce457a7b66afaab317163474df5d096d02d8ff03a4ed296aed202d18dac0c06de5aebcaa96d6ede8a98ef5efa20a815beac4d
+AUX eblits/src_configure-v50160001.eblit 4561 SHA256 4f6b992e53537eac2fb809ab82097d8fffd4f1321c438fc9b7ea45a4359b3f14 SHA512 d06555a3ee5f443fb89bc2d316884eea5a38517a39420928208ade87f490d5d9a87cc4157f56e6ecd769406c943fb8f38947c26354cf2bf89c88248967b37031 WHIRLPOOL 2b8d01f15ebf87366179044be51e52525777f7a8353ca7362847d734469c4bfd84bb124aeedc4ce281100bb5c54f3122a377176398d24be11dff74943bdac18e
 AUX eblits/src_install-v50160001.eblit 2068 SHA256 4f763bac589235cb072103f9caecd7a02813ba9a89d722959f7f9432b4d4c56b SHA512 bd4c355a3a4649e6f89feee4461583423d87b276ef672305124fb0e49888bcc5012d4f0359926aa6b7c657ecea1a329d10b68f6bfb7f1450f922fde0aae3eddf WHIRLPOOL df62650c93776ba736d53ace725893e6a8652f04b4cafe97591f5b8b732b8b1ee35b99be40041157f876cc94e74c7b8cdb897cf53df5802e783092792e8f360a
 AUX eblits/src_prepare-v50160001.eblit 2114 SHA256 dc803c75ffa7194149d7891c90cbdcd56e634afa6d0988db52242c27a6e1df3e SHA512 e6a32a3fd4b1b35ea146aefb67df74517304237d3fede12feaf52a1eed5880c2c15ad3b6bf2eb5bd153c60df5d6e9da583408d469d9014299dd4704e9a65d3db WHIRLPOOL b93e03c60c76a34da9d783bd88b2e0ec6c34c9a3a291973ad856180f4ed7b88ccbdd57fb95227c809c27a8a7537c67bf5ed573f5d7eba35b147ba26242438313
 AUX eblits/src_test-v50160001.eblit 503 SHA256 35a8a1a6f89e351e4587c82ef3c30699f8a37d78570e28510c5e02bc9e352198 SHA512 09c6f1b253119d0ad7f7d698c37d9d1979a67a2866c72677177c47d9e7c413a7588e2e531bb1e9790ce49add618b768a7fa271e05171a3ce73fa4433034f91f7 WHIRLPOOL 9aae83a23fc6246d26729ad940a7a13bb89e3b2223581e34000f8a93470455bc8ca5b71ae47bf5e6809544793fe21f7207beca3681990c849838497f32f08b51
@@ -77,7 +77,7 @@ MISC metadata.xml 451 SHA256 49e06011c113616fa1f618cf58d42c2d6abbce5f71936f109b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (Darwin)
 
-iEYEAREIAAYFAlApYV8ACgkQX3X2B8XHTole2QCfdMe0ItBFz8KpeK0DYdO8GD2T
-KHgAn3tDYz7pHVochgk2L0V0CXqDrEBP
-=tsZz
+iEYEAREIAAYFAlAr76AACgkQX3X2B8XHTok1aQCfQu1AhKL9veI/r1NmvhNFsF4K
+CMMAn2meLlVuulq5uGoJGsAsPDD7FjbF
+=Wr8U
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/perl/files/eblits/src_configure-v50160001.eblit b/dev-lang/perl/files/eblits/src_configure-v50160001.eblit
index e3f524737236..4a5cc8ad7508 100644
--- a/dev-lang/perl/files/eblits/src_configure-v50160001.eblit
+++ b/dev-lang/perl/files/eblits/src_configure-v50160001.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_configure-v50160001.eblit,v 1.3 2012/08/13 20:19:37 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_configure-v50160001.eblit,v 1.4 2012/08/15 18:51:06 grobian Exp $
 
 myconf() {
 	# the myconf array is declared in src_configure
@@ -79,7 +79,6 @@ eblit-perl-src_configure() {
 	# something compatible.
 	if use prefix ; then
 		local ldir
-		local llib
 		local paths=""
 		echo "int main() {}" > "${T}"/t.c
 		# need to ensure dirs contain compatible libs,
@@ -87,14 +86,14 @@ eblit-perl-src_configure() {
 		$(tc-getCC) -o "${T}"/t "${T}"/t.c > /dev/null || die
 		local scantool=scanelf
 		[[ ${CHOST} == *-darwin* ]] && scantool=scanmacho
-		local mtype=$(${scantool} -BF "%a#f" "${T}"/t)
+		local mtype=$(${scantool} -BF "%M%D#f" "${T}"/t)
+		einfo "searching libdirs for ${mtype}"
 		for ldir in /lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib ; do
-			 [[ -d ${ldir} ]] || continue
-			 # find a random lib from here
-			 llib=( ${ldir}/*$(get_libname) )
-			 [[ -e ${llib[0]} ]] || continue
-			 [[ $(${scantool} -BF "%a#f" ${llib[0]}) == ${mtype} ]] \
-				  && paths="${paths} ${ldir}"
+			[[ -d ${ldir} ]] || continue
+			if ${scantool} -BF "%M%D#f" ${ldir} | grep -q ${mtype} ; then
+				paths="${paths} ${ldir}"
+				einfo "found ${ldir}"
+			fi
 		done
 		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
 	elif [[ $(get_libdir) != "lib" ]] ; then