| 1 |
mgorny 13/07/30 14:04:13 |
| 2 |
|
| 3 |
Modified: llvm-3.4-gentoo-install.patch |
| 4 |
llvm-3.3-gentoo-install.patch |
| 5 |
Log: |
| 6 |
Revert the RPATH changes and LD_LIBRARY_PATH hack as it resulted in system clang using build tree libraries, bug #478348. Instead, alter the RPATH after installing the libs. Fix installing libLTO and libprofile_rt. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 sys-devel/llvm/files/llvm-3.4-gentoo-install.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: llvm-3.4-gentoo-install.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- llvm-3.4-gentoo-install.patch 21 Jul 2013 10:00:50 -0000 1.1 |
| 24 |
+++ llvm-3.4-gentoo-install.patch 30 Jul 2013 14:04:13 -0000 1.2 |
| 25 |
@@ -44,25 +44,17 @@ |
| 26 |
endif |
| 27 |
endif |
| 28 |
endif |
| 29 |
-@@ -605,7 +605,6 @@ endif |
| 30 |
- ifdef SHARED_LIBRARY |
| 31 |
- ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) |
| 32 |
- ifneq ($(HOST_OS),Darwin) |
| 33 |
-- LD.Flags += $(RPATH) -Wl,'$$ORIGIN' |
| 34 |
- endif |
| 35 |
- endif |
| 36 |
- endif |
| 37 |
@@ -643,11 +642,11 @@ endif |
| 38 |
ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) |
| 39 |
ifneq ($(HOST_OS), Darwin) |
| 40 |
ifdef TOOLNAME |
| 41 |
- LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(DynamicFlag) |
| 42 |
-+ LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag) |
| 43 |
++ LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag) |
| 44 |
endif |
| 45 |
else |
| 46 |
ifneq ($(DARWIN_MAJVERS),4) |
| 47 |
- LD.Flags += $(RPATH) -Wl,@executable_path/../lib |
| 48 |
-+ LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)' |
| 49 |
++ LD.Flags += $(RPATH) -Wl,@executable_path/../lib $(RPATH) -Wl,'$(PROJ_libdir)' |
| 50 |
endif |
| 51 |
ifeq ($(RC_XBS),YES) |
| 52 |
TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX) |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
1.2 sys-devel/llvm/files/llvm-3.3-gentoo-install.patch |
| 57 |
|
| 58 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch?rev=1.2&view=markup |
| 59 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch?rev=1.2&content-type=text/plain |
| 60 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch?r1=1.1&r2=1.2 |
| 61 |
|
| 62 |
Index: llvm-3.3-gentoo-install.patch |
| 63 |
=================================================================== |
| 64 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch,v |
| 65 |
retrieving revision 1.1 |
| 66 |
retrieving revision 1.2 |
| 67 |
diff -u -r1.1 -r1.2 |
| 68 |
--- llvm-3.3-gentoo-install.patch 21 Jul 2013 10:00:50 -0000 1.1 |
| 69 |
+++ llvm-3.3-gentoo-install.patch 30 Jul 2013 14:04:13 -0000 1.2 |
| 70 |
@@ -44,20 +44,12 @@ |
| 71 |
endif |
| 72 |
endif |
| 73 |
|
| 74 |
-@@ -601,7 +601,6 @@ endif |
| 75 |
- ifdef SHARED_LIBRARY |
| 76 |
- ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) |
| 77 |
- ifneq ($(HOST_OS),Darwin) |
| 78 |
-- LD.Flags += $(RPATH) -Wl,'$$ORIGIN' |
| 79 |
- endif |
| 80 |
- endif |
| 81 |
- endif |
| 82 |
@@ -639,7 +638,7 @@ endif |
| 83 |
ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) |
| 84 |
ifneq ($(HOST_OS), Darwin) |
| 85 |
ifdef TOOLNAME |
| 86 |
- LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' |
| 87 |
-+ LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)' |
| 88 |
++ LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)' |
| 89 |
ifdef EXAMPLE_TOOL |
| 90 |
LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag) |
| 91 |
else |
| 92 |
@@ -66,7 +58,7 @@ |
| 93 |
else |
| 94 |
ifneq ($(DARWIN_MAJVERS),4) |
| 95 |
- LD.Flags += $(RPATH) -Wl,@executable_path/../lib |
| 96 |
-+ LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)' |
| 97 |
++ LD.Flags += $(RPATH) -Wl,@executable_path/../lib -Wl,'$(PROJ_libdir)' |
| 98 |
endif |
| 99 |
ifeq ($(RC_XBS),YES) |
| 100 |
TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX) |
Archives