Backport to rename alignof, fixes C++'0x compilers support

Package-Manager: portage-2.2.0_alpha9/cvs/Linux x86_64

5 files changed, 255 insertions, 15 deletions

diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 8aa431963877..007c2c3905f7 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,13 +1,14 @@
 AUX clang-2.7-darwin-prefix.patch 3294 RMD160 4968d4703833035b17ec87ddc5a03fcc242be9e1 SHA1 cfaa15d0bca9798492b68e3f36ba8a146f0c6b33 SHA256 6e14d6363ae32febb96a8ffe599b32a96691baef27c48d5186f368036d4e2378
 AUX clang-2.7-fixdoc.patch 1977 RMD160 62f52e5580baa396d93c56735c0039c8691b43b6 SHA1 351c1d2cf86b6da75a6ed19083d7a857333f007c SHA256 36c2214e575ed3fd78938279739e82c4f750f8726f8387e1414c18532501314a
+AUX clang-2.8-alignof.patch 11984 RMD160 3ddf038274481a325ced3a736a5109302d0c50b5 SHA1 7d040a7d2d54e64b85cd2ac188d151d8b89fc62a SHA256 2c1d648c64cc6582a00b0adbc5c65e3ac89a1bb1816e0691902866730a332fa2
 AUX clang-2.8-darwin-prefix.patch 4989 RMD160 e2c863f62b6f9ef3b26b9b2a41cfd9950fb174b4 SHA1 dfda0f3d1f9bac791ed7fb0c06d8c91e931a8fd5 SHA256 808d6d47b7eb133a4e1091bf24b64690fe14d3f5b66fec7a9ed3d91aeb1f03d7
+AUX clang-2.8-gcc-4.4.4.patch 710 RMD160 3d7246d1af95ab0a45035c9caede4844da33ef9e SHA1 72c9d2c1433623c3f6c7f5720b3dff46b190feea SHA256 ce722ffd0b2dfb8d1a36db3927238ebacd19469823fa84ca3e415ca7cfcb454d
 DIST clang-2.7.tgz 4953739 RMD160 177fdcf59be4a60c37cf0dfb058535c9cdbbad4e SHA1 4d8326bfe2308a7355a5e4ca2eb172bffd761e1e SHA256 fb349471947f155c1cda1c8a4a3bbc7fa437b86f6875d9978f86c915dfed623a
 DIST clang-2.8.tgz 5666777 RMD160 f00956b6de29cc09f3992aeabd140f2189c6cf39 SHA1 94977c84ce136307dbbeade95e67bfe3c25161ff SHA256 ed83481553e6a39a8a2953e89630d881d87833506f096a90f18d93ec2bdee0c1
 DIST llvm-2.7.tgz 8374297 RMD160 0fa2f362dd6a45efec35ce8fa0f8d36d98f32c8f SHA1 059fc21b0ec1b649c4a3dec81756e5f92aa131a2 SHA256 99664bdc8503a306038166af33f28eb426d99e297575a59d74a1a0dcbddbbca5
 DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b
 EBUILD clang-2.7-r4.ebuild 5698 RMD160 3696f22da1c248567a23f7d93c074f20e4b18647 SHA1 3d68f473c04054bbed11c4397925f1bbc5fcf0e5 SHA256 ccbb47c31340d22ed2f3e78f162d6e68975107609b2dcee3bf4e61c8f29b5c3b
-EBUILD clang-2.8-r1.ebuild 5557 RMD160 8bfc20e270118f636cc653c6077f57744910a45f SHA1 820b2e58a0858462127481674d434306ce0b9d54 SHA256 21c9c19e4f61c1541112dee465e236390437230d88ef8433e5a8b1d5d30f9871
-EBUILD clang-2.8-r2.ebuild 6525 RMD160 9d1ff5b6e038f076e25f96a2827f5e86f67624f2 SHA1 366171c810434a600b737178749c60f53e713773 SHA256 06d99e3e82939d58d0c77369f7e4ec1a12d73f3f08fa34fb26e1bfa9d13f3564
+EBUILD clang-2.8-r3.ebuild 6683 RMD160 5461e67eb03ea9c3a1323db9da8b8a9e526e2985 SHA1 703c48d7470ef4504003a9c45d78d10870b6b21f SHA256 86c126de86c7d539f846926779cc134f4e9bac0199e1c30714413a3fad95d023
 EBUILD clang-9999.ebuild 5852 RMD160 42477f97bb83b703946fb536ce56dab194e980e5 SHA1 b527f10640d5efcb33471dc4b4dd00afe9517781 SHA256 d45486fd9eb7efba7db4b4a05fe0930076af0b1283b5bab5e9987079262b5fba
-MISC ChangeLog 5716 RMD160 f7d3364a9f157daca2ed22ca65414bee5d0ab1e9 SHA1 9a2e98c22fd621261511e1fa6d77cc53dbf61b49 SHA256 67ae2f7b51d380a8f7cddd2c90f2173a9e2b5181a4c45d554a4d1d93b3fd4b14
+MISC ChangeLog 6115 RMD160 33567151f4e12d317bbdfe2a77050c6f6a71fff2 SHA1 a6f9e687490fe3a32c5269586070f8c2f92eea1f SHA256 45babd25d9d9329770870851ce457e07fd0ca43c1f4b1adb557691748eaa182d
 MISC metadata.xml 1360 RMD160 73b894c5108dd5d2d3b49f82353920da7f2adc4c SHA1 6808434002d0109de4ef8f52ad4a9cc4f4a2fbfc SHA256 14c80bf0afbebde4ec5bc2332865762d3dcd98db842cf52fc78617b4889dae38
diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 6996c167b082..78e43afbd24d 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.29 2010/11/11 17:31:47 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.30 2010/12/19 22:45:41 voyageur Exp $
+
+*llvm-2.8-r2 (19 Dec 2010)
+
+  19 Dec 2010; Bernard Cafarelli <voyageur@gentoo.org> +llvm-2.8-r2.ebuild,
+  +files/llvm-2.8-alignof.patch:
+  Backport to rename alignof, fixes C++'0x compilers support
 
   11 Nov 2010; Markos Chandras <hwoarang@gentoo.org> llvm-2.8-r1.ebuild:
   Stable on amd64 wrt bug #336371
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 3aba23bb10f9..6008c6c60de1 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX llvm-2.6-commandguide-nops.patch 975 RMD160 1178c27a8845c2c86d6d381ba3d95b4b9b627f1e SHA1 41b9d8c3ae0ed1023ec72bf629c53fa8981e0264 SHA256 0e36fb43e020fa380230a8c6f2a79b9a19e12e857e833ef856e2b41aaa283649
 AUX llvm-2.6-nodoctargz.patch 1602 RMD160 b4de7f5e68386bd9dab44a6d7addae0eb9d7f958 SHA1 5a2faf5d9c52f1eb1f1eac3aa69b6d0499c093a4 SHA256 503d31616ca7c76f6da1cd46d6e7c54241effbd11652ab568759350f0c21e473
 AUX llvm-2.7-nodoctargz.patch 1878 RMD160 a6134fd292a1a2c6a594e787ce73b15012be04bb SHA1 9d32a0e15791789d8bf58dfecf9580a00d150319 SHA256 983657329ebede731b397ba0256d729b3958f39faea64c9f7d065ab8d2a3e7fd
+AUX llvm-2.8-alignof.patch 2522 RMD160 6a359ba15b1943929541c5e7bbd6a2a6480e85bc SHA1 41f11ba3fdb4d6cd8761380594bd777fd83e2f96 SHA256 a9f7add4f4002bf9af438c0c4d1ca86875d6214a5044334325a60cdcbc8a3cdc
 AUX llvm-2.8-darwin8.patch 576 RMD160 ed1d9c8d9eda3fecf55b7848eee76cdd92a59a13 SHA1 60d0772513d66e7a79d70f0a98f03c67ab1d1d0f SHA256 6db04d9bb5fe65f8a92972988477328a7358e325abca32f30a716ff454d0fe21
 DIST llvm-2.7.tgz 8374297 RMD160 0fa2f362dd6a45efec35ce8fa0f8d36d98f32c8f SHA1 059fc21b0ec1b649c4a3dec81756e5f92aa131a2 SHA256 99664bdc8503a306038166af33f28eb426d99e297575a59d74a1a0dcbddbbca5
 DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b
 EBUILD llvm-2.7-r2.ebuild 5538 RMD160 3e36cb73164fd354e60a7c1083b3c9966dd95173 SHA1 88e6629da79f994e97c4dc2d3db6d19a1995f852 SHA256 d342cafa2e1e7839ec4f789d5668b0da443be04694edf6c2665864329c1ea920
 EBUILD llvm-2.7.ebuild 5236 RMD160 5a52b3e435fb2d3bdfb1c0db64495a423a5afddb SHA1 7586b8071ecba77ef1c61ac0941d41d7bab49362 SHA256 6fa2d7c4a821aaf8ad14dc5c8a0c0186897e99f5977e053f3175011cad79a6f4
 EBUILD llvm-2.8-r1.ebuild 6028 RMD160 2bb099adef2f3c0147373fa98d13b40bac282553 SHA1 f5aaeb44da3e76ee1fab93a4a403d1ac56124f8b SHA256 b617489e6a13ba521a776f3c3935578ae93088f43353ee9779b135025b6b4c37
+EBUILD llvm-2.8-r2.ebuild 6101 RMD160 5683f0c0aff4a3ac4adaaa3bdee89ede42ff4368 SHA1 a68b25d0ac12258fa47cf57308ac63d561cf3450 SHA256 3af59e5081c95a7e2037f9162512666d2cf1e4212b08f44dcc1c9d3bf2848a8d
 EBUILD llvm-9999.ebuild 5844 RMD160 a1aef98c0ecea6bf7d97d0e77ec65814ee6e5d3a SHA1 bd8108b3c56193117a1661b512a7302603a5f557 SHA256 416e8f591729c589f3d47980907ff2341d0ac99759046e44e1a1ec796de2c5aa
-MISC ChangeLog 4940 RMD160 2deef26506c9947354457284fe477a31182d86cd SHA1 a2e6a0f20eb42c746f89c3c0c6114ac475167e5c SHA256 0fabfae65a33675de574043b11201e36f272ea8535fd6e8cf191ed1ffb6c9236
+MISC ChangeLog 5139 RMD160 2e250c77c6e8a0bbd59facc0759867669f943f48 SHA1 157b0bccb0cea73c9e285c5c41732221ad7076e8 SHA256 4d084ced015866450a397b5167ec7e13929503e73bf688f87ce629fc1ab0ef65
 MISC metadata.xml 2384 RMD160 9e29d256ab1d3d7cc23fe25d170a1716b6e35dba SHA1 db599887234c1013a7849be3e1b6bd399c716598 SHA256 44f73ce01ca8dc1d2fea546bb70550d6324ed893a224a6db8e55fd932b3a10f8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzcKKIACgkQ9/cejkQaxBCe6gCdEJwgR0eEBffwhcS2AohWXjwY
-1WsAnA8z8G4U1Qk6SQKkX2qpsL2Vo4YU
-=gRv1
------END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/files/llvm-2.8-alignof.patch b/sys-devel/llvm/files/llvm-2.8-alignof.patch
new file mode 100644
index 000000000000..ae7f314d2d26
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-2.8-alignof.patch
@@ -0,0 +1,59 @@
+Index: include/llvm/ADT/StringMap.h
+===================================================================
+--- include/llvm/ADT/StringMap.h	(révision 117773)
++++ include/llvm/ADT/StringMap.h	(révision 117774)
+@@ -167,7 +167,7 @@
+ 
+     unsigned AllocSize = static_cast<unsigned>(sizeof(StringMapEntry))+
+       KeyLength+1;
+-    unsigned Alignment = alignof<StringMapEntry>();
++    unsigned Alignment = alignOf<StringMapEntry>();
+ 
+     StringMapEntry *NewItem =
+       static_cast<StringMapEntry*>(Allocator.Allocate(AllocSize,Alignment));
+Index: include/llvm/Support/AlignOf.h
+===================================================================
+--- include/llvm/Support/AlignOf.h	(révision 117773)
++++ include/llvm/Support/AlignOf.h	(révision 117774)
+@@ -49,12 +49,12 @@
+ 
+ };
+ 
+-/// alignof - A templated function that returns the mininum alignment of
++/// alignOf - A templated function that returns the mininum alignment of
+ ///  of a type.  This provides no extra functionality beyond the AlignOf
+ ///  class besides some cosmetic cleanliness.  Example usage:
+-///  alignof<int>() returns the alignment of an int.
++///  alignOf<int>() returns the alignment of an int.
+ template <typename T>
+-static inline unsigned alignof() { return AlignOf<T>::Alignment; }
++static inline unsigned alignOf() { return AlignOf<T>::Alignment; }
+ 
+ } // end namespace llvm
+ #endif
+Index: include/llvm/Support/Allocator.h
+===================================================================
+--- include/llvm/Support/Allocator.h	(révision 117773)
++++ include/llvm/Support/Allocator.h	(révision 117774)
+@@ -201,7 +201,7 @@
+       char *End = Slab == Allocator.CurSlab ? Allocator.CurPtr :
+                                               (char *)Slab + Slab->Size;
+       for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) {
+-        Ptr = Allocator.AlignPtr(Ptr, alignof<T>());
++        Ptr = Allocator.AlignPtr(Ptr, alignOf<T>());
+         if (Ptr + sizeof(T) <= End)
+           reinterpret_cast<T*>(Ptr)->~T();
+       }
+Index: include/llvm/CodeGen/SlotIndexes.h
+===================================================================
+--- include/llvm/CodeGen/SlotIndexes.h	(révision 117773)
++++ include/llvm/CodeGen/SlotIndexes.h	(révision 117774)
+@@ -393,7 +393,7 @@
+       IndexListEntry *entry =
+         static_cast<IndexListEntry*>(
+           ileAllocator.Allocate(sizeof(IndexListEntry),
+-          alignof<IndexListEntry>()));
++          alignOf<IndexListEntry>()));
+ 
+       new (entry) IndexListEntry(mi, index);
+ 
diff --git a/sys-devel/llvm/llvm-2.8-r2.ebuild b/sys-devel/llvm/llvm-2.8-r2.ebuild
new file mode 100644
index 000000000000..3dfb4ecafeef
--- /dev/null
+++ b/sys-devel/llvm/llvm-2.8-r2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2010 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.1 2010/12/19 22:45:41 voyageur Exp $
+
+EAPI="3"
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="http://llvm.org/"
+# Upstream silently re-released the tarball...
+# drop the -> in 2.9
+SRC_URI="http://llvm.org/releases/${PV}/${P}.tgz -> ${P}-r1.tgz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos"
+IUSE="alltargets debug +libffi llvm-gcc ocaml test udis86"
+
+DEPEND="dev-lang/perl
+	>=sys-devel/make-3.79
+	>=sys-devel/flex-2.5.4
+	>=sys-devel/bison-1.28
+	!~sys-devel/bison-1.85
+	!~sys-devel/bison-1.875
+	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 )
+	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
+	libffi? ( virtual/libffi )
+	ocaml? ( dev-lang/ocaml )
+	udis86? ( amd64? ( dev-libs/udis86[pic] )
+		!amd64? ( dev-libs/udis86 ) )"
+RDEPEND="dev-lang/perl"
+
+S=${WORKDIR}/${PN}-${PV/_pre*}
+
+pkg_setup() {
+	# need to check if the active compiler is ok
+
+	broken_gcc=" 3.2.2 3.2.3 3.3.2 4.1.1 "
+	broken_gcc_x86=" 3.4.0 3.4.2 "
+	broken_gcc_amd64=" 3.4.6 "
+
+	gcc_vers=$(gcc-fullversion)
+
+	if [[ ${broken_gcc} == *" ${version} "* ]] ; then
+		elog "Your version of gcc is known to miscompile llvm."
+		elog "Check http://www.llvm.org/docs/GettingStarted.html for"
+		elog "possible solutions."
+		die "Your currently active version of gcc is known to miscompile llvm"
+	fi
+
+	if [[ ${CHOST} == i*86-* && ${broken_gcc_x86} == *" ${version} "* ]] ; then
+		elog "Your version of gcc is known to miscompile llvm on x86"
+		elog "architectures.  Check"
+		elog "http://www.llvm.org/docs/GettingStarted.html for possible"
+		elog "solutions."
+		die "Your currently active version of gcc is known to miscompile llvm"
+	fi
+
+	if [[ ${CHOST} == x86_64-* && ${broken_gcc_amd64} == *" ${version} "* ]];
+	then
+		 elog "Your version of gcc is known to miscompile llvm in amd64"
+		 elog "architectures.  Check"
+		 elog "http://www.llvm.org/docs/GettingStarted.html for possible"
+		 elog "solutions."
+		die "Your currently active version of gcc is known to miscompile llvm"
+	 fi
+}
+
+src_prepare() {
+	# unfortunately ./configure won't listen to --mandir and the-like, so take
+	# care of this.
+	einfo "Fixing install dirs"
+	sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \
+		-e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \
+		-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/${PN}, \
+		-i Makefile.config.in || die "Makefile.config sed failed"
+	sed -e 's,$ABS_RUN_DIR/lib,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
+		-i tools/llvm-config/llvm-config.in.in || die "llvm-config sed failed"
+
+	einfo "Fixing rpath"
+	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
+		-i Makefile.rules || die "rpath sed failed"
+
+	epatch "${FILESDIR}"/${PN}-2.7-nodoctargz.patch
+	epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
+	epatch "${FILESDIR}"/${PN}-2.8-darwin8.patch
+	# Upstream backport, r117774
+	epatch "${FILESDIR}"/${P}-alignof.patch
+}
+
+src_configure() {
+	local CONF_FLAGS="--enable-shared"
+
+	if use debug; then
+		CONF_FLAGS="${CONF_FLAGS} --disable-optimized"
+		einfo "Note: Compiling LLVM in debug mode will create huge and slow binaries"
+		# ...and you probably shouldn't use tmpfs, unless it can hold 900MB
+	else
+		CONF_FLAGS="${CONF_FLAGS} \
+			--enable-optimized \
+			--disable-assertions \
+			--disable-expensive-checks"
+	fi
+
+	if use alltargets; then
+		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
+	else
+		CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only"
+	fi
+
+	if use amd64; then
+		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
+	fi
+
+	# things would be built differently depending on whether llvm-gcc is
+	# used or not.
+	local LLVM_GCC_DIR=/dev/null
+	local LLVM_GCC_DRIVER=nope ; local LLVM_GPP_DRIVER=nope
+	if use llvm-gcc ; then
+		if has_version sys-devel/llvm-gcc; then
+			LLVM_GCC_DIR=$(ls -d ${EROOT}/usr/$(get_libdir)/llvm-gcc* 2> /dev/null)
+			LLVM_GCC_DRIVER=$(find ${LLVM_GCC_DIR} -name 'llvm*-gcc' 2> /dev/null)
+			if [[ -z ${LLVM_GCC_DRIVER} ]] ; then
+				die "failed to find installed llvm-gcc, LLVM_GCC_DIR=${LLVM_GCC_DIR}"
+			fi
+			einfo "Using $LLVM_GCC_DRIVER"
+			LLVM_GPP_DRIVER=${LLVM_GCC_DRIVER/%-gcc/-g++}
+		else
+			eerror "llvm-gcc USE flag enabled, but sys-devel/llvm-gcc was not found"
+			eerror "Building with standard gcc, re-merge this package after installing"
+			eerror "llvm-gcc to build with it"
+			eerror "This is normal behavior on first LLVM merge"
+		fi
+	fi
+
+	CONF_FLAGS="${CONF_FLAGS} \
+		--with-llvmgccdir=${LLVM_GCC_DIR} \
+		--with-llvmgcc=${LLVM_GCC_DRIVER} \
+		--with-llvmgxx=${LLVM_GPP_DRIVER}"
+
+	if use ocaml; then
+		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=ocaml"
+	else
+		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=none"
+	fi
+
+	if use udis86; then
+		CONF_FLAGS="${CONF_FLAGS} --with-udis86"
+	fi
+	CONF_FLAGS="${CONF_FLAGS} $(use_enable libffi)"
+	econf ${CONF_FLAGS} || die "econf failed"
+}
+
+src_compile() {
+	emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 || die "emake failed"
+}
+
+src_install() {
+	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed"
+
+	# Fix install_names on Darwin.  The build system is too complicated
+	# to just fix this, so we correct it post-install
+	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
+			[[ -f ${ED}/usr/lib/${PN}/${lib} ]] || continue
+			ebegin "fixing install_name of $lib"
+			install_name_tool \
+				-id "${EPREFIX}"/usr/lib/${PN}/${lib} \
+				"${ED}"/usr/lib/${PN}/${lib}
+			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##*/}"
+			install_name_tool \
+				-change "${S}"/Release/lib/libLLVM-${PV}.dylib \
+					"${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \
+				"${f}"
+			eend $?
+		done
+	fi
+}