Fix install_name pointer to libLLVM-x.y.dylib in a more flexible way to avoid bugs like #391763

Package-Manager: portage-2.2.01.19572-prefix/cvs/SunOS i386

6 files changed, 36 insertions, 23 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index ccfe7217efe9..60012d580fa9 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.51 2011/11/22 13:42:23 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.52 2011/11/24 08:56:51 grobian Exp $
+
+  24 Nov 2011; Fabian Groffen <grobian@gentoo.org> llvm-2.8-r2.ebuild,
+  llvm-9999.ebuild, llvm-2.9-r2.ebuild, llvm-3.0_rc3.ebuild:
+  Fix install_name pointer to libLLVM-x.y.dylib in a more flexible way to avoid
+  bugs like #391763
 
   22 Nov 2011; Bernard Cafarelli <voyageur@gentoo.org> llvm-3.0_rc3.ebuild,
   metadata.xml:
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index ce00fcd003ae..683e39cde6c9 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX llvm-2.6-commandguide-nops.patch 975 RMD160 1178c27a8845c2c86d6d381ba3d95b4b9b627f1e SHA1 41b9d8c3ae0ed1023ec72bf629c53fa8981e0264 SHA256 0e36fb43e020fa380230a8c6f2a79b9a19e12e857e833ef856e2b41aaa283649
 AUX llvm-2.7-nodoctargz.patch 1878 RMD160 a6134fd292a1a2c6a594e787ce73b15012be04bb SHA1 9d32a0e15791789d8bf58dfecf9580a00d150319 SHA256 983657329ebede731b397ba0256d729b3958f39faea64c9f7d065ab8d2a3e7fd
@@ -10,16 +10,16 @@ AUX llvm-2.9-nodoctargz.patch 1569 RMD160 6589aa0a41f47e915ce93fe6dcf68dd601c3bc
 DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b
 DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 500f587f840199ac53c4fc7572839d08fa9d9123 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
 DIST llvm-3.0rc3.src.tar.gz 10348810 RMD160 971ce6ed7c242827a8c02af7248f6305b1624bd3 SHA1 268025875ee738adaf1d45c3a2627f7c6e0b8272 SHA256 273b3a4fb3608b2373680af48bf083253e51a7ef52456034f6542460c0edac18
-EBUILD llvm-2.8-r2.ebuild 6156 RMD160 9e76bf90d103993330bcf8701c8ee490117c3ab1 SHA1 f691fe35a6a02da441fd9aa1c52a04a2aff298a9 SHA256 9bc669e88d0a49b5fa7c5ada8da9752cade9876fb03bb16cbad1afebee507d1b
-EBUILD llvm-2.9-r2.ebuild 6115 RMD160 d36d9ab00ea269e431bfcd08468a0304211da9ea SHA1 2e41c1a449f79160dd21e9f1a1a8ae6ef3fd7b2b SHA256 fa97ce98ffe1b1e5231b4f164522d1fc4099fcc8e7a137958bb4ae1ac46ddfe8
-EBUILD llvm-3.0_rc3.ebuild 5341 RMD160 81fd0f18fab6faa33bf4c0114bc55165e40694ea SHA1 c64014d5293edbea8a39fdf9219c50e199efda73 SHA256 dc458ac52cd7efaaaea78e6b860e39bcc6e90576adcd5c719e8f223a8fda6860
-EBUILD llvm-9999.ebuild 4974 RMD160 8956e441647bfa6cf3bf15960fd7124cd8e90d28 SHA1 f0d7c502087051edb3b311f15376aace0c357f5c SHA256 080fe2ecb218c0bae613e8031f6cfb50b3fc191bfa9216d244c56432cbb36cf6
-MISC ChangeLog 8484 RMD160 11cd2d2bdb2da00a09bbc2f220cb714a4a514b75 SHA1 ece9291a34346e209d134eb3724b1e71164896dd SHA256 ae260070ea05271368882f38723fcc75e6bb487835154483ed7109d1ddb99453
+EBUILD llvm-2.8-r2.ebuild 6222 RMD160 34c51d4deb8ba605df908542a581099af7043a7f SHA1 c86b4cfe710b65ffedd934096df8394da9a8798f SHA256 4e9fc704a4aa3b1a8e07bf9807f1f3fbdc429d1ab075edf025dd6b96e003d852
+EBUILD llvm-2.9-r2.ebuild 6172 RMD160 e1507b6c2032f8ad318682674bc31bdfe34690e3 SHA1 6be78605d31add9365535d9e840c5a4b3755471b SHA256 80409c96d121da4ec4e7c991d2a6bbac33900a96eba40c523e00dae660604f8a
+EBUILD llvm-3.0_rc3.ebuild 5400 RMD160 d0f9c61af5ec05731e0198e603c0c3157fc26af2 SHA1 6fc0c758df452e6fab05777f46f3fb524c0b4d1e SHA256 3291d2d4f42cc38b130a26534951a51cfa41e7b5f181f20400d6df0273a82efd
+EBUILD llvm-9999.ebuild 5033 RMD160 ac61255318126e1a984b4e725d0bf3e4ab499b21 SHA1 b5190c01e562442f04bd293a8c7584e932190978 SHA256 ab751f00c744caa5189bfba7f933065a79dcdeb627fd95e0594043c5611a7d97
+MISC ChangeLog 8716 RMD160 e25a116fe8d9a81e9e01237abd3a5d2683119ea3 SHA1 d640d9ab075931c0ae13f3e633b4b0e78631ad62 SHA256 c84b4ffaafc4b3a38f746d055ecc559e9c8a188c8cc408152a08548971a9239b
 MISC metadata.xml 2290 RMD160 3c36b274b863158d4a53be2c99ea5f42ede2bb80 SHA1 d608d42b2a831a4b9025fa1d2fd68fb11996293b SHA256 fd3cd6846072dbcacb0a3461a3d1a47bb09b858562df26fb9fc0769f0a292bf4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.18 (SunOS)
 
-iF4EAREIAAYFAk7LpsoACgkQFYEBGcdFJfLgHAD/XHIGoYkL26CdnXTFz5bm30ca
-b53I1ku/9YDENN92deYA/0na0lTk/jiuYkt/w1ZPrzoDy6ePvuxxfjxlUq/9U0HA
-=qGSZ
+iEYEARECAAYFAk7OBtoACgkQX3X2B8XHTokThwCfbqqW2hK8ze4PlHaUNqx+DCfO
+c/UAn1dP4aoWt5bbBQcn8QV+JoA74dgV
+=5sUM
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-2.8-r2.ebuild b/sys-devel/llvm/llvm-2.8-r2.ebuild
index 9a5ee3e983ac..100bb598ff8b 100644
--- a/sys-devel/llvm/llvm-2.8-r2.ebuild
+++ b/sys-devel/llvm/llvm-2.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.8-r2.ebuild,v 1.7 2011/10/04 11:43:37 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.8-r2.ebuild,v 1.8 2011/11/24 08:56:51 grobian Exp $
 
 EAPI="3"
 inherit eutils multilib toolchain-funcs
@@ -160,6 +160,7 @@ 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=
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		for lib in lib{EnhancedDisassembly,LLVM-${PV},BugpointPasses,LLVMHello,LTO,profile_rt}.dylib ; do
 			# libEnhancedDisassembly is Darwin10 only, so non-fatal
@@ -171,9 +172,10 @@ src_install() {
 			eend $?
 		done
 		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do
-			ebegin "fixing install_name reference to libLLVM-${PV}.dylib of ${f##*/}"
+			odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${PV}.dylib)
+			ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
 			install_name_tool \
-				-change "${S}"/Release/lib/libLLVM-${PV}.dylib \
+				-change "${odylib}" \
 					"${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \
 				"${f}"
 			eend $?
diff --git a/sys-devel/llvm/llvm-2.9-r2.ebuild b/sys-devel/llvm/llvm-2.9-r2.ebuild
index a7d8b5983eeb..7243f1107fae 100644
--- a/sys-devel/llvm/llvm-2.9-r2.ebuild
+++ b/sys-devel/llvm/llvm-2.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.9-r2.ebuild,v 1.4 2011/11/17 18:50:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.9-r2.ebuild,v 1.5 2011/11/24 08:56:51 grobian Exp $
 
 EAPI="3"
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -162,6 +162,7 @@ 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=
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		for lib in lib{EnhancedDisassembly,LLVM-${PV},LTO}.dylib {BugpointPasses,LLVMHello,profile_rt}.dylib ; do
 			# libEnhancedDisassembly is Darwin10 only, so non-fatal
@@ -173,9 +174,10 @@ src_install() {
 			eend $?
 		done
 		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do
-			ebegin "fixing install_name reference to libLLVM-${PV}.dylib of ${f##*/}"
+			odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${PV}.dylib)
+			ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
 			install_name_tool \
-				-change "@executable_path/../lib/libLLVM-${PV}.dylib" \
+				-change "${odylib}" \
 					"${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \
 				"${f}"
 			eend $?
diff --git a/sys-devel/llvm/llvm-3.0_rc3.ebuild b/sys-devel/llvm/llvm-3.0_rc3.ebuild
index 4114f5673542..c763098c7233 100644
--- a/sys-devel/llvm/llvm-3.0_rc3.ebuild
+++ b/sys-devel/llvm/llvm-3.0_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0_rc3.ebuild,v 1.2 2011/11/22 13:42:23 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0_rc3.ebuild,v 1.3 2011/11/24 08:56:51 grobian Exp $
 
 EAPI="3"
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -141,6 +141,7 @@ 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=
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		for lib in lib{EnhancedDisassembly,LLVM-${PV},LTO}.dylib {BugpointPasses,LLVMHello,profile_rt}.dylib ; do
 			# libEnhancedDisassembly is Darwin10 only, so non-fatal
@@ -152,9 +153,10 @@ src_install() {
 			eend $?
 		done
 		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do
-			ebegin "fixing install_name reference to libLLVM-${PV}.dylib of ${f##*/}"
+			odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${PV}.dylib)
+			ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
 			install_name_tool \
-				-change "@executable_path/../lib/libLLVM-${PV}.dylib" \
+				-change "${odylib}" \
 					"${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \
 				"${f}"
 			eend $?
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 171369e9b8b6..e0304fbe1c08 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.16 2011/11/09 15:11:05 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.17 2011/11/24 08:56:51 grobian Exp $
 
 EAPI="3"
 inherit subversion eutils flag-o-matic multilib toolchain-funcs
@@ -132,6 +132,7 @@ 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=
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		for lib in lib{EnhancedDisassembly,LLVM-${PV},LTO}.dylib {BugpointPasses,LLVMHello,profile_rt}.dylib ; do
 			# libEnhancedDisassembly is Darwin10 only, so non-fatal
@@ -143,9 +144,10 @@ src_install() {
 			eend $?
 		done
 		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do
-			ebegin "fixing install_name reference to libLLVM-${PV}.dylib of ${f##*/}"
+			odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${PV}.dylib)
+			ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
 			install_name_tool \
-				-change "@executable_path/../lib/libLLVM-${PV}.dylib" \
+				-change "${odylib}" \
 					"${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \
 				"${f}"
 			eend $?