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

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

[Michał Górny]

commit:     4714bb3e8ef617ed5e1f55ffafd082df42bf0db3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 19 14:00:08 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 14:00:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=4714bb3e

Fix broken RPATHs for llvm-3.3.

This version of llvm requires the local RPATH for tests. Sadly, this
means the final file's getting insecure RPATHs.

---
 sys-devel/llvm/files/llvm-3.3-gentoo-install.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 d6c0d7a..a147242 100644
--- a/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch
+++ b/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch
@@ -55,7 +55,7 @@ index f0c542b..db252f7 100644
    ifneq ($(HOST_OS), Darwin)
      ifdef TOOLNAME
 -      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
-+      LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)'
++      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)'
        ifdef EXAMPLE_TOOL
          LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag)
        else

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

[Michał Górny]

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

llvm-9999: add RPATH to 'llvm-config --ldflags'.

---
 sys-devel/llvm/files/llvm-3.4-gentoo-install.patch | 50 ++++++++++++++++++----
 1 file changed, 42 insertions(+), 8 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 a1a27c9..2493674 100644
--- a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
+++ b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
@@ -1,15 +1,17 @@
-From cdc2bf59ab8200a4bd6b0eb66ac5b8a8ebab67d6 Mon Sep 17 00:00:00 2001
+From f0927633bf1d6426624f1c266b1407b18ac1cd80 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 dcca45f..45bf0d1 100644
@@ -77,8 +79,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..2afaaea 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 3924e2e..d087ae0 100644
+index 3924e2e..169e8bf 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) {
@@ -90,6 +114,16 @@ index 3924e2e..d087ae0 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

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

[Michał Górny]

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

Fix broken rpaths for llvm-9999 as well.

It seems that I was mistaken and both versions need $ORIGIN.

---
 sys-devel/llvm/files/llvm-3.4-gentoo-install.patch | 4 ++--
 1 file changed, 2 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 2798fa7..a1a27c9 100644
--- a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
+++ b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
@@ -55,12 +55,12 @@ index 1bc78f1..60cd228 100644
    ifneq ($(HOST_OS), Darwin)
      ifdef TOOLNAME
 -      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(DynamicFlag)
-+      LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag)
++      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag)
      endif
    else
      ifneq ($(DARWIN_MAJVERS),4)
 -      LD.Flags += $(RPATH) -Wl,@executable_path/../lib
-+      LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)'
++      LD.Flags += $(RPATH) -Wl,@executable_path/../lib $(RPATH) -Wl,'$(PROJ_libdir)'
      endif
      ifeq ($(RC_XBS),YES)
        TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX)