[gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/files/, sys-devel/llvm/

["Michał Górny" <mgorny@gentoo.org>]

commit:     700f2c0ea97d728e57aa0b73271b84429dad485f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 19 19:18:28 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 19:18:28 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=700f2c0e

llvm-9999: add build tree paths to LD_LIBRARY_PATH instead of RPATH.

This allows us to keep clean RPATHs in executables while keeping build
and tests working.

---
 sys-devel/llvm/files/llvm-3.4-gentoo-install.patch |  4 ++--
 sys-devel/llvm/llvm-9999-r1.ebuild                 | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
index 2493674..ad3eec1 100644
--- a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
+++ b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
@@ -57,12 +57,12 @@ index 1bc78f1..60cd228 100644
    ifneq ($(HOST_OS), Darwin)
      ifdef TOOLNAME
 -      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(DynamicFlag)
-+      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag)
++      LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag)
      endif
    else
      ifneq ($(DARWIN_MAJVERS),4)
 -      LD.Flags += $(RPATH) -Wl,@executable_path/../lib
-+      LD.Flags += $(RPATH) -Wl,@executable_path/../lib $(RPATH) -Wl,'$(PROJ_libdir)'
++      LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)'
      endif
      ifeq ($(RC_XBS),YES)
        TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX)

diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index e87142d..e3d56dc 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.ebuild
@@ -131,6 +131,17 @@ src_prepare() {
 
 	multilib_copy_sources
 	multilib_foreach_abi multilib_src_prepare
+
+	# Add LLVM built libraries to LD_LIBRARY_PATH.
+	# This way we don't have to hack RPATHs of executables.
+	local libpath
+	if use debug; then
+		libpath=Debug+Asserts+Checks/lib
+	else
+		libpath=Release/lib
+	fi
+
+	export LD_LIBRARY_PATH=${libpath}${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
 }
 
 multilib_src_configure() {