Update install_name patching, by Michael Weiser, bug #536716

Package-Manager: portage-2.2.14-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

6 files changed, 66 insertions, 35 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 6a1a01e1ee49..f32d0d2fca0c 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.222 2015/01/25 23:45:06 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.223 2015/01/31 16:42:19 grobian Exp $
+
+  31 Jan 2015; Fabian Groffen <grobian@gentoo.org> llvm-3.4.2.ebuild,
+  llvm-3.5.0.ebuild, llvm-3.5.1.ebuild, llvm-9999.ebuild:
+  Update install_name patching, by Michael Weiser, bug #536716
 
   25 Jan 2015; Bernard Cafarelli <voyageur@gentoo.org> llvm-9999.ebuild:
   Update ocaml tests path for live ebuild, bug #537504
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 94bb1fd9b4a3..aa567ab28110 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -70,16 +70,16 @@ EBUILD llvm-3.0-r2.ebuild 5767 SHA256 62fca1169c63516f29102a3a1bb4ea74408dfd151d
 EBUILD llvm-3.1-r2.ebuild 6033 SHA256 9b9a587d30419fa646764a96e12fc6272f73f7246138c76ba577f0d6ab3afe59 SHA512 8b969084210af4203c029bb33d5b984e0b17f6770fd489dad818154ac9f6a87bfad069eff71776f678d9eb5d5136af472d3008d5bc73fab9dc1f36811af906c4 WHIRLPOOL 928459551d7cf6e8d18244026ba82cc3dbaf2b65bd6eac8adb617695c95535ba65bd013909730d5922de5764e9d6c6c4cf007aa6acd0b493826aa938d0389a5d
 EBUILD llvm-3.2.ebuild 6534 SHA256 eb16cc91887fdb035722d268caaa3e4843825403786fcf74643be2c6f8099f11 SHA512 e781a4e4416a4acee667029744dab7f8e52022df4fcbb89d4d9acf855549f1c0a1661b79ee0067fd052a36bad278f08a2ff7f6e6e44d8c3ea7f82910ac573d9b WHIRLPOOL 115d13959a22867266dd7c0133109ccba063e97972cc2c807fb7a6dd7d3fbef1726caf314e262f6683a97a2c3a6ff776f808de7d80923472fc692554eccbca27
 EBUILD llvm-3.3-r3.ebuild 14190 SHA256 d16d933d6791ef7dbe08aa43340bb9924e063af11fa9e13ca8230509240d2c15 SHA512 c986e970f489f7ff79188043db397383e3c567735c8f4a1e8a13b89ef6a3a9f4b8550218444eadd04ef3a14143ab05dc839b3dbe935128f5437157d3aaec02cf WHIRLPOOL 910f7d65902548270835371a5076c746534c0b57487fb8fb149a893454e86e942beed284d6b7491cfb2f043a6e19554f97aec829067938192e75f64bd0fd7a7c
-EBUILD llvm-3.4.2.ebuild 15684 SHA256 bf48165569f4e1d74e59315ad96183c2275a4ebd909460e9478ea5ece021da23 SHA512 0885736fb3e33aa6aa76c8f83e9280e66482e4748722f9ebb767e1ca47fa94e00ab2007702c7aa35a36c06103fa41ce00fa3a8123e9adc14bcc0778edc211cad WHIRLPOOL a659c1f8dc8452299ce98e7b9d7e66515b1c8fcf8922d97888bc761acbe4e6d40412c635e5bbee9207c68cdf9c46d13b3c8e4012f38abb54c930a1b2eab5348d
-EBUILD llvm-3.5.0.ebuild 15104 SHA256 f3f8698353f9c5d2c9e28ade63b4573e6efb5cbace7da0ee400cfcd7e3e486b6 SHA512 a3434a4ef8050300f9e7309e35693c0b928bb5b438d95c54cf76298f29669b16466711f341ef0d37a3b6817342667f18130d106a2e839fcac0855a0db519758a WHIRLPOOL 4f662cdf9fb8b53d17c6c958b9734e91a7d085bcba0d7ad32c8a21e079adc57f62ef925ae1d1016e1642452e62d2cba1e8a9e39241d783cca8baad43bf9045e5
-EBUILD llvm-3.5.1.ebuild 15188 SHA256 e3c5d7d3a296aae9e63056639cfd61193304463b97dc185a606fbb0aa9f29ed8 SHA512 4183767844999dd8a6a8c678ac081a635d7a439bff0df8d6bd3a333b1b9aaa55f6e115e54196b4118da7d9d885bb5969d274b571f237ede6ce45c249d494fed9 WHIRLPOOL e005ccd6aae7fadb591ec77ac4b18cc5827d12b37becb25e2d4807585e11c63c0a637cbb9a74f40b2e71fee324c3354d5d87daa40dd3e3a5a11d66e29e36cabc
-EBUILD llvm-9999.ebuild 14030 SHA256 100a066262458d0735c18efe5fac3eca49ca11dd77896d2d9dde809e9c40602c SHA512 6b03a4ab6b96839bbdc31c801b8726005154f4f064b4889a367bad302a0cc42857c757f1f3dd60234afc3c7891c9d22e357f00be83c1534e69b7d1ac74b22459 WHIRLPOOL 4301e989d0e781038239711c1e8fce5e3aca39257181563e3c5a36807ff4b1c698a05fa982233bb26108bcae4bbac868145ebe9fc44b5ab114e18d8b5616aa10
-MISC ChangeLog 37132 SHA256 51356e7526fed9dc0bb79601ddee1f95cee2d170e6f6ee1f50d841ec43d39a37 SHA512 7a34ea9f43e10247035c1e34357c98d4b127595e100169e14c2716e09d251e15d939a69958817cc7d6a52f39712538ff34ecc95795e9d93aae480ae8dff5b247 WHIRLPOOL 927aa9a2e9942d9888ff4f0588c7492b6eaebc34b9ec5161b40fb7491171bce5dc02d9e726c2c5ffb67e9fd41010adf26065cc66dee6ca2669d9b2353a5728bf
+EBUILD llvm-3.4.2.ebuild 15816 SHA256 7161dca64fae0794d74f5d1bae7e6e4fda64fec1fdde6803c81a077c02a661dc SHA512 d6ded682ad49b6b29e727dc5a7a4e01cc47618b841f99087a4260738d10b8bb700aca1c966b3d0dfbe3552649a29344d14a3796a200c2aaf446ac003d8a318e8 WHIRLPOOL 38c0214e80f8a7ff00a5cfc5230ce95826bd797b3ffbe212e6ad0276db47d63782664d036efdc39428b9c0984784f941f42195f7b1aeddb1b119885b8323c541
+EBUILD llvm-3.5.0.ebuild 15237 SHA256 6db16b21c07fa6da9cdaae4e1c73420a1695d086df76a3c839b11e6b6d5f0b51 SHA512 7b26a3c21860deb4e007dcb9fb5ce0280fb83e23c8cefce8bacee7ce4a6cf80dbce9ef7f65ceb4f13fba30a9cb5032db2b80dbba575f40c61d82c21f9f62df71 WHIRLPOOL b3dc1e6b2e43eeb72790bb46efd7ad26db849b25fab300528d49034b6df88be5736aab12f0f55db2cf20845c92896ef92b4ed2babc7849cd732e2e85c88e4d52
+EBUILD llvm-3.5.1.ebuild 15319 SHA256 7a8f42efe3842795d60d390615b7641ae8f92b31419ddb4b069d61c743942c71 SHA512 0cd34d35473fdba92f8d6dedcfeb073846f70907faef11c10d4e804c99dbb6ade2da0ec867b76d23f6c32034cefdc7b14e98812dd9230ec449e32c69b0a2765e WHIRLPOOL 457d4f16392b398dd2b17703b618523a50b5346251fa827d5eb17aa3dd79a91425837f77c3bb9f96eedbdce74947026a1263f61276ce7514a800b9b7aebc81ba
+EBUILD llvm-9999.ebuild 14404 SHA256 051cec3c7783c493f860df71aee4b24c49fdc249213f05dedff8b7cbe8a46248 SHA512 b91df32dc54fe6a7ebc1205f26541c7bc44254256428d85a36c97144ba9245c5772b13d2c7f306549c860051d9e9f98158e21b70407d816e1431f7a5b742e3ef WHIRLPOOL 0f665fc3ff34d1cd77a8cd2f9c5a099dd31cc6ace926882531b557d953363b824a85167d50ee3579924ff728125dad5205c8fab197e1859d0254a2ed5a9907c1
+MISC ChangeLog 37323 SHA256 0255ede0f42c5face73611a27bf61d3ccb8f359365454933dd00b7eb9cb8d691 SHA512 98ec4c7128382aafded7c01f382c1d95322c4635198aa84732874b3dc043dc0e9683ca9d0cbc2246898256a63adce2f2c72166896ce2425e0f2232ee762b916f WHIRLPOOL c261ec647f5dbc1d2cc68f012cea5d114707c90a75313dc9239b5778c9622af6f9214fe02a3b904576233644dcdf92210e4e507c5378d96d2841c05cc6721ad8
 MISC metadata.xml 2787 SHA256 22dc7b91c98fb4258271cc9cd4bd99f214b30f258bbdfea83dc37ac74df8d498 SHA512 4fca0d2551a889e7800c688077adf405697d05730bf66621ac53fdefeeeaddb7a8d868973edc9a6fe48e9a07734f1d43fd88229bae693fe181a7dbb95eeb9481 WHIRLPOOL 6284033d40bef02510f924ec1e6a9d3e1072bf26945fdedde0ddaf1d6d35c3d30971cdefa583a8e4d9db3da67bee04145ace15ded4cee63f534588b66633c76b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlTFgAgACgkQFYEBGcdFJfI2EAD/XUPJs8VGtoHznYQa6mCHlO3E
-Utgs+efxcspEcM6/VcoA/1RWNFNsyb2mKj5BYtFiAFg061rs3nDydvK/884S8aXv
-=p9M/
+iEYEAREIAAYFAlTNBe4ACgkQX3X2B8XHTon+dgCff3FQHLwLQ5QIzEwy+/XDM72j
+eUcAniS+o5f6FBcZx7asE+/r3QebpwsC
+=QfyD
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-3.4.2.ebuild b/sys-devel/llvm/llvm-3.4.2.ebuild
index a994c39fa8d9..ab980276c876 100644
--- a/sys-devel/llvm/llvm-3.4.2.ebuild
+++ b/sys-devel/llvm/llvm-3.4.2.ebuild
@@ -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/sys-devel/llvm/llvm-3.4.2.ebuild,v 1.6 2015/01/11 20:05:43 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild,v 1.7 2015/01/31 16:42:19 grobian Exp $
 
 EAPI=5
 
@@ -452,7 +452,8 @@ multilib_src_install() {
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		eval $(grep PACKAGE_VERSION= configure)
 		[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
-		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib; do
+		libpvminor=${libpv%.[0-9]*}
+		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do
 			# libEnhancedDisassembly is Darwin10 only, so non-fatal
 			# + omit clang libs if not enabled
 			[[ -f ${ED}/usr/lib/${lib} ]] || continue
@@ -465,7 +466,7 @@ multilib_src_install() {
 		done
 		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
 			# omit clang libs if not enabled
-			[[ -f ${ED}/usr/lib/${lib} ]] || continue
+			[[ -f "${f}" ]] || continue
 
 			scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
 			while read odylib ; do
@@ -477,6 +478,9 @@ multilib_src_install() {
 					*/libLLVM-${libpv}.dylib)
 						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
 						;;
+					*/libLLVM-${libpvminor}.dylib)
+						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib
+						;;
 					*/libLTO.dylib)
 						ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
 						;;
diff --git a/sys-devel/llvm/llvm-3.5.0.ebuild b/sys-devel/llvm/llvm-3.5.0.ebuild
index aff2a55dbea6..653454f418f0 100644
--- a/sys-devel/llvm/llvm-3.5.0.ebuild
+++ b/sys-devel/llvm/llvm-3.5.0.ebuild
@@ -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/sys-devel/llvm/llvm-3.5.0.ebuild,v 1.11 2015/01/01 20:53:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v 1.12 2015/01/31 16:42:19 grobian Exp $
 
 EAPI=5
 
@@ -438,7 +438,8 @@ multilib_src_install() {
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		eval $(grep PACKAGE_VERSION= configure)
 		[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
-		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib; do
+		libpvminor=${libpv%.[0-9]*}
+		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do
 			# libEnhancedDisassembly is Darwin10 only, so non-fatal
 			# + omit clang libs if not enabled
 			[[ -f ${ED}/usr/lib/${lib} ]] || continue
@@ -451,7 +452,7 @@ multilib_src_install() {
 		done
 		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
 			# omit clang libs if not enabled
-			[[ -f ${ED}/usr/lib/${lib} ]] || continue
+			[[ -f "${f}" ]] || continue
 
 			scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
 			while read odylib ; do
@@ -463,6 +464,9 @@ multilib_src_install() {
 					*/libLLVM-${libpv}.dylib)
 						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
 						;;
+					*/libLLVM-${libpvminor}.dylib)
+						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib
+						;;
 					*/libLTO.dylib)
 						ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
 						;;
diff --git a/sys-devel/llvm/llvm-3.5.1.ebuild b/sys-devel/llvm/llvm-3.5.1.ebuild
index 827c230dadc1..1450de676e3a 100644
--- a/sys-devel/llvm/llvm-3.5.1.ebuild
+++ b/sys-devel/llvm/llvm-3.5.1.ebuild
@@ -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/sys-devel/llvm/llvm-3.5.1.ebuild,v 1.3 2015/01/23 13:22:11 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild,v 1.4 2015/01/31 16:42:19 grobian Exp $
 
 EAPI=5
 
@@ -438,7 +438,8 @@ multilib_src_install() {
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		eval $(grep PACKAGE_VERSION= configure)
 		[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
-		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib; do
+		libpvminor=${libpv%.[0-9]*}
+		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do
 			# libEnhancedDisassembly is Darwin10 only, so non-fatal
 			# + omit clang libs if not enabled
 			[[ -f ${ED}/usr/lib/${lib} ]] || continue
@@ -451,7 +452,7 @@ multilib_src_install() {
 		done
 		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
 			# omit clang libs if not enabled
-			[[ -f ${ED}/usr/lib/${lib} ]] || continue
+			[[ -f "${f}" ]] || continue
 
 			scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
 			while read odylib ; do
@@ -463,6 +464,9 @@ multilib_src_install() {
 					*/libLLVM-${libpv}.dylib)
 						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
 						;;
+					*/libLLVM-${libpvminor}.dylib)
+						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib
+						;;
 					*/libLTO.dylib)
 						ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
 						;;
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 86161d3e7d48..9061b960e871 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -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/sys-devel/llvm/llvm-9999.ebuild,v 1.98 2015/01/25 23:45:06 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.99 2015/01/31 16:42:19 grobian Exp $
 
 EAPI=5
 
@@ -415,11 +415,12 @@ multilib_src_install() {
 
 	# Fix install_names on Darwin.  The build system is too complicated
 	# to just fix this, so we correct it post-install
-	local lib= f= odylib= libpv=${PV}
+	local lib= f= odylib= ndylib= libpv=${PV}
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		eval $(grep PACKAGE_VERSION= configure)
 		[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
-		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib ; do
+		libpvminor=${libpv%.[0-9]*}
+		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do
 			# libEnhancedDisassembly is Darwin10 only, so non-fatal
 			# + omit clang libs if not enabled
 			[[ -f ${ED}/usr/lib/${lib} ]] || continue
@@ -430,21 +431,35 @@ multilib_src_install() {
 				"${ED}"/usr/lib/${lib}
 			eend $?
 		done
-		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib{LTO,clang}.dylib ; do
+		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
 			# omit clang libs if not enabled
-			[[ -f ${ED}/usr/lib/${lib} ]] || continue
-
-			odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${libpv}.dylib)
-			ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
-			install_name_tool \
-				-change "${odylib}" \
-					"${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib \
-				-change "@rpath/libclang.dylib" \
-					"${EPREFIX}"/usr/lib/libclang.dylib \
-				-change "${S}"/Release/lib/libclang.dylib \
-					"${EPREFIX}"/usr/lib/libclang.dylib \
-				"${f}"
-			eend $?
+			[[ -f "${f}" ]] || continue
+
+			scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
+			while read odylib ; do
+				ndylib=
+				case ${odylib} in
+					*/libclang.dylib)
+						ndylib="${EPREFIX}"/usr/lib/libclang.dylib
+						;;
+					*/libLLVM-${libpv}.dylib)
+						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
+						;;
+					*/libLLVM-${libpvminor}.dylib)
+						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib
+						;;
+					*/libLTO.dylib)
+						ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
+						;;
+				esac
+				if [[ -n ${ndylib} ]] ; then
+					ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
+					install_name_tool \
+						-change "${odylib}" "${ndylib}" \
+						"${f}"
+					eend $?
+				fi
+			done
 		done
 	fi
 }