| 1 |
mgorny 13/12/28 14:04:46 |
| 2 |
|
| 3 |
Added: llvm-3.3-r2-gentoo-install.patch |
| 4 |
Log: |
| 5 |
Backport all the fixes and install design changes from -9999 to -3.3. Fixes bugs #425844 (install CMake modules), #462554 (install bfd-plugins symlink), #489586 (multilib portage compat.), #488216, #492554 (RPATH issues). |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-devel/llvm/files/llvm-3.3-r2-gentoo-install.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/llvm-3.3-r2-gentoo-install.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/llvm-3.3-r2-gentoo-install.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: llvm-3.3-r2-gentoo-install.patch |
| 16 |
=================================================================== |
| 17 |
From a554809b6bdbe29b1f775c89104c1088300685ef Mon Sep 17 00:00:00 2001 |
| 18 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 19 |
Date: Sat, 28 Dec 2013 10:30:28 +0100 |
| 20 |
Subject: [PATCH] Update for gentoo install layout. |
| 21 |
|
| 22 |
--- |
| 23 |
Makefile.config.in | 6 +++--- |
| 24 |
Makefile.rules | 8 ++++---- |
| 25 |
tools/llvm-config/BuildVariables.inc.in | 1 + |
| 26 |
tools/llvm-config/Makefile | 2 ++ |
| 27 |
tools/llvm-config/llvm-config.cpp | 2 +- |
| 28 |
utils/FileCheck/Makefile | 2 +- |
| 29 |
6 files changed, 12 insertions(+), 9 deletions(-) |
| 30 |
|
| 31 |
diff --git a/Makefile.config.in b/Makefile.config.in |
| 32 |
index fd4f6ef..b63786c 100644 |
| 33 |
--- a/Makefile.config.in |
| 34 |
+++ b/Makefile.config.in |
| 35 |
@@ -95,10 +95,10 @@ PROJ_internal_prefix := $(prefix) |
| 36 |
endif |
| 37 |
|
| 38 |
PROJ_bindir := $(PROJ_prefix)/bin |
| 39 |
-PROJ_libdir := $(PROJ_prefix)/lib |
| 40 |
+PROJ_libdir := $(PROJ_prefix)/$(GENTOO_LIBDIR) |
| 41 |
PROJ_datadir := $(PROJ_prefix)/share |
| 42 |
-PROJ_docsdir := $(PROJ_prefix)/docs/llvm |
| 43 |
-PROJ_etcdir := $(PROJ_prefix)/etc/llvm |
| 44 |
+PROJ_docsdir := $(PROJ_prefix)/share/doc/@PF@ |
| 45 |
+PROJ_etcdir := @EPREFIX@/etc/llvm |
| 46 |
PROJ_includedir := $(PROJ_prefix)/include |
| 47 |
PROJ_infodir := $(PROJ_prefix)/info |
| 48 |
PROJ_mandir := $(PROJ_prefix)/share/man |
| 49 |
diff --git a/Makefile.rules b/Makefile.rules |
| 50 |
index f0c542b..6cc19fd 100644 |
| 51 |
--- a/Makefile.rules |
| 52 |
+++ b/Makefile.rules |
| 53 |
@@ -276,7 +276,7 @@ ifeq ($(ENABLE_OPTIMIZED),1) |
| 54 |
# Don't use -fomit-frame-pointer on Darwin or FreeBSD. |
| 55 |
ifneq ($(HOST_OS),FreeBSD) |
| 56 |
ifneq ($(HOST_OS),Darwin) |
| 57 |
- OmitFramePointer := -fomit-frame-pointer |
| 58 |
+ OmitFramePointer := |
| 59 |
endif |
| 60 |
endif |
| 61 |
|
| 62 |
@@ -601,7 +601,7 @@ endif |
| 63 |
ifdef SHARED_LIBRARY |
| 64 |
ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) |
| 65 |
ifneq ($(HOST_OS),Darwin) |
| 66 |
- LD.Flags += $(RPATH) -Wl,'$$ORIGIN' |
| 67 |
+ LD.Flags += |
| 68 |
endif |
| 69 |
endif |
| 70 |
endif |
| 71 |
@@ -641,9 +641,9 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) |
| 72 |
ifdef TOOLNAME |
| 73 |
LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' |
| 74 |
ifdef EXAMPLE_TOOL |
| 75 |
- LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag) |
| 76 |
+ LD.Flags += $(DynamicFlag) |
| 77 |
else |
| 78 |
- LD.Flags += $(RPATH) -Wl,$(ToolDir) $(DynamicFlag) |
| 79 |
+ LD.Flags += $(DynamicFlag) |
| 80 |
endif |
| 81 |
endif |
| 82 |
else |
| 83 |
diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in |
| 84 |
index fe87afb..908acd4 100644 |
| 85 |
--- a/tools/llvm-config/BuildVariables.inc.in |
| 86 |
+++ b/tools/llvm-config/BuildVariables.inc.in |
| 87 |
@@ -25,3 +25,4 @@ |
| 88 |
#define LLVM_BUILDMODE "@LLVM_BUILDMODE@" |
| 89 |
#define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" |
| 90 |
#define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" |
| 91 |
+#define LLVM_LIBDIR "@LLVM_LIBDIR@" |
| 92 |
diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile |
| 93 |
index b20b6bf..0aeba45 100644 |
| 94 |
--- a/tools/llvm-config/Makefile |
| 95 |
+++ b/tools/llvm-config/Makefile |
| 96 |
@@ -55,6 +55,8 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir |
| 97 |
>> temp.sed |
| 98 |
$(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \ |
| 99 |
>> temp.sed |
| 100 |
+ $(Verb) $(ECHO) 's/@LLVM_LIBDIR@/$(subst /,\/,$(GENTOO_LIBDIR))/' \ |
| 101 |
+ >> temp.sed |
| 102 |
$(Verb) $(SED) -f temp.sed < $< > $@ |
| 103 |
$(Verb) $(RM) temp.sed |
| 104 |
|
| 105 |
diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp |
| 106 |
index 7edf5ec..c09b702 100644 |
| 107 |
--- a/tools/llvm-config/llvm-config.cpp |
| 108 |
+++ b/tools/llvm-config/llvm-config.cpp |
| 109 |
@@ -250,7 +250,7 @@ int main(int argc, char **argv) { |
| 110 |
ActivePrefix = CurrentExecPrefix; |
| 111 |
ActiveIncludeDir = ActivePrefix + "/include"; |
| 112 |
ActiveBinDir = ActivePrefix + "/bin"; |
| 113 |
- ActiveLibDir = ActivePrefix + "/lib"; |
| 114 |
+ ActiveLibDir = ActivePrefix + "/" LLVM_LIBDIR; |
| 115 |
ActiveIncludeOption = "-I" + ActiveIncludeDir; |
| 116 |
} |
| 117 |
|
| 118 |
diff --git a/utils/FileCheck/Makefile b/utils/FileCheck/Makefile |
| 119 |
index 268b7bc..e7674f9 100644 |
| 120 |
--- a/utils/FileCheck/Makefile |
| 121 |
+++ b/utils/FileCheck/Makefile |
| 122 |
@@ -15,7 +15,7 @@ USEDLIBS = LLVMSupport.a |
| 123 |
TOOL_NO_EXPORTS = 1 |
| 124 |
|
| 125 |
# Don't install this utility |
| 126 |
-NO_INSTALL = 1 |
| 127 |
+#NO_INSTALL = 1 |
| 128 |
|
| 129 |
include $(LEVEL)/Makefile.common |
| 130 |
|
| 131 |
-- |
| 132 |
1.8.5.2 |
Archives