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

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

commit:     c90ad7aaea030f28543b9a7282c12b18cc71d9d1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 19 19:29:47 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 21:24:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=c90ad7aa

sys-devel/llvm: backport -9999 changes to -3.3.

---
 sys-devel/llvm/files/llvm-3.3-gentoo-install.patch | 52 ++++++++++++++++++----
 sys-devel/llvm/llvm-3.3-r1.ebuild                  | 11 +++++
 2 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch
index a147242..14ff44f 100644
--- a/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch
+++ b/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch
@@ -1,15 +1,17 @@
-From 1430e07a00ca87b665c5f9ed53512e896cce729c Mon Sep 17 00:00:00 2001
+From 7843380cdbc4f4519b3669585122bd0a28d3cd29 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl>
 Date: Fri, 19 Jul 2013 10:10:52 +0200
 Subject: [PATCH] gentoo install fixes
 
 ---
- Makefile.config.in                | 6 +++---
- Makefile.rules                    | 7 +++----
- tools/gold/Makefile               | 2 +-
- tools/llvm-config/llvm-config.cpp | 2 +-
- utils/FileCheck/Makefile          | 2 +-
- 5 files changed, 9 insertions(+), 10 deletions(-)
+ Makefile.config.in                      | 6 +++---
+ Makefile.rules                          | 7 +++----
+ tools/gold/Makefile                     | 2 +-
+ tools/llvm-config/BuildVariables.inc.in | 1 +
+ tools/llvm-config/Makefile              | 2 ++
+ tools/llvm-config/llvm-config.cpp       | 5 +++--
+ utils/FileCheck/Makefile                | 2 +-
+ 7 files changed, 14 insertions(+), 11 deletions(-)
 
 diff --git a/Makefile.config.in b/Makefile.config.in
 index fd4f6ef..ad6595f 100644
@@ -55,7 +57,7 @@ index f0c542b..db252f7 100644
    ifneq ($(HOST_OS), Darwin)
      ifdef TOOLNAME
 -      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
-+      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)'
++      LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)'
        ifdef EXAMPLE_TOOL
          LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag)
        else
@@ -81,8 +83,30 @@ index 496e31c..d36b340 100644
  
  include $(LEVEL)/Makefile.common
  
+diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in
+index fe87afb..94952ca 100644
+--- a/tools/llvm-config/BuildVariables.inc.in
++++ b/tools/llvm-config/BuildVariables.inc.in
+@@ -25,3 +25,4 @@
+ #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"
+ #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"
+ #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@"
++#define LLVM_RPATH "@LLVM_RPATH@"
+diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile
+index b20b6bf..3747baf 100644
+--- a/tools/llvm-config/Makefile
++++ b/tools/llvm-config/Makefile
+@@ -55,6 +55,8 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir
+ 	  >> temp.sed
+ 	$(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \
+ 	  >> temp.sed
++	$(Verb) $(ECHO) 's/@LLVM_RPATH@/$(subst /,\/,$(RPATH))/' \
++	  >> temp.sed
+ 	$(Verb) $(SED) -f temp.sed < $< > $@
+ 	$(Verb) $(RM) temp.sed
+ 
 diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
-index 7edf5ec..4ea5ca3 100644
+index 7edf5ec..abd2888 100644
 --- a/tools/llvm-config/llvm-config.cpp
 +++ b/tools/llvm-config/llvm-config.cpp
 @@ -250,7 +250,7 @@ int main(int argc, char **argv) {
@@ -94,6 +118,16 @@ index 7edf5ec..4ea5ca3 100644
      ActiveIncludeOption = "-I" + ActiveIncludeDir;
    }
  
+@@ -277,7 +277,8 @@ int main(int argc, char **argv) {
+       } else if (Arg == "--cxxflags") {
+         OS << ActiveIncludeOption << ' ' << LLVM_CXXFLAGS << '\n';
+       } else if (Arg == "--ldflags") {
+-        OS << "-L" << ActiveLibDir << ' ' << LLVM_LDFLAGS
++        OS << "-L" << ActiveLibDir << ' '
++           << LLVM_RPATH << " -Wl," << ActiveLibDir << ' ' << LLVM_LDFLAGS
+            << ' ' << LLVM_SYSTEM_LIBS << '\n';
+       } else if (Arg == "--libs") {
+         PrintLibs = true;
 diff --git a/utils/FileCheck/Makefile b/utils/FileCheck/Makefile
 index 268b7bc..e7674f9 100644
 --- a/utils/FileCheck/Makefile

diff --git a/sys-devel/llvm/llvm-3.3-r1.ebuild b/sys-devel/llvm/llvm-3.3-r1.ebuild
index daef29f..123564f 100644
--- a/sys-devel/llvm/llvm-3.3-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.3-r1.ebuild
@@ -148,6 +148,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() {