| 1 |
commit: 83d24922608136fa2400002fbf4268584b992f90 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 3 09:04:50 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 3 10:27:49 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83d24922 |
| 7 |
|
| 8 |
sys-devel/llvm: Move 3.5.2 patchset to tarball |
| 9 |
|
| 10 |
sys-devel/llvm/Manifest | 1 + |
| 11 |
.../llvm/files/3.5.2/clang/gentoo-install.patch | 57 --------------- |
| 12 |
sys-devel/llvm/files/3.5.2/gcc-5.1.patch | 14 ---- |
| 13 |
sys-devel/llvm/files/3.5.2/gentoo-install.patch | 83 ---------------------- |
| 14 |
sys-devel/llvm/llvm-3.5.2-r100.ebuild | 17 ++--- |
| 15 |
5 files changed, 10 insertions(+), 162 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest |
| 18 |
index ea4cd6bdd9d..1b38130c102 100644 |
| 19 |
--- a/sys-devel/llvm/Manifest |
| 20 |
+++ b/sys-devel/llvm/Manifest |
| 21 |
@@ -20,6 +20,7 @@ DIST llvm-3.4-manpages.tar.bz2 33753 SHA256 dc2616104cf333dd9ef56b2d31f9a36e8130 |
| 22 |
DIST llvm-3.4.2-patchset.tar.gz 4612 SHA256 ec5d12763c0181ae0ff7485b08a69b621a988df278fcb3ae009551d637da824c SHA512 32c7cf229a6a8917f0fc67efa1fb11994945281f6906395cee7e5c51399c8fb4c06f554a03253c8f9073890a7bc7af151a8adfe887ad62f45f1523e6e358f769 WHIRLPOOL 408d1b2e55aa14acd3ae34918d164a53ebc3eddf8e3f8e77deb52acbab9e76bf94365d94c34ad6155d2537739a7fffab1b7f088be7d25ba77dd1796164f77721 |
| 23 |
DIST llvm-3.4.2.src.tar.gz 15938155 SHA256 17038d47069ad0700c063caed76f0c7259628b0e79651ce2b540d506f2f1efd7 SHA512 6c1453f7d9d9110257db3574cc4f6227fed8938705cbb09851ac09a868089b48f1556a1b6e758aff6d97520b08b5605d3ed20411ad9dd22cdc573d62176905f0 WHIRLPOOL f8b4d5167469e6f350ec41aede04e7b756e18f3d8e78b3270beb5791310a7b9b13c69e57c8bcfefbd0a78efc0c40e3b75a9a158eac72c025b7c77146e8dfaf7c |
| 24 |
DIST llvm-3.5.0-manpages.tar.bz2 35314 SHA256 724e752a60016dce8cc536658906d3646c600e977374e0ea692a5d0fe2d4a021 SHA512 d99d6096d7f21a81923297584fe5eeb23e0d83d4538fe376615c92fffc8aff3189999f7ab3c537b5aa5d6bc2c22c53eb05717d48c7ab99c42315b8665bac62c3 WHIRLPOOL 68ced06ee6678c5333c662eb1cc0da744c5a184b12dd059c1b77ec200b1d3cc231f270b9d9b6e177d728776894277b3f9061338aa55620c90474eb97915b7819 |
| 25 |
+DIST llvm-3.5.2-patchset.tar.gz 4568 SHA256 9a987625d5d5a06cbf2733c68815ae0083a7bba30be7c53c3cda996ab61df52e SHA512 6df5a61d3e949dbe9840e713eb90e7514760c5ae68e241494d0246925015ac7e9d73671dd0646eb44d2d9232665027783d02c00639f41385615ec541d4e2fa93 WHIRLPOOL a34e09f22b62b12adcf3d948a2e9769868f70cc0692feb8e574a224999e74edea6bf82c16b48fa658de0f06f6d7f6987e8e8dd1d65cdf9b6a0d0bdf7ee3cdaab |
| 26 |
DIST llvm-3.5.2.src.tar.xz 11876128 SHA256 44196156d5749eb4b4224fe471a29cc3984df92570a4a89fa859f7394fc0c575 SHA512 0f6a83cc61a385387e7baf8fb8f0d9f18e3fd00d2d389a3c7e2c3792be7d82ed095506cac52c24e65ae3c1f94456a441d39440feef6125e25ef18447ec9dd406 WHIRLPOOL b41de51907d6d2c2d04a4c498b44f0ed560cc710e6e2d8678f5ef93a9009d140bc7c2406f4b25d5b901fd026689d48edce77a2e435687b489b835156a512e256 |
| 27 |
DIST llvm-3.6.1-manpages.tar.bz2 38338 SHA256 b27c6198e09b11421841a7184d4e8a0f8878d4f1313405da28d643134a55688a SHA512 a47aeb0b4632329eaaa1d6c774446fea5822d7692d81533a9a5c5de1c6a3b37fdd6b7c1fc6433339649f4d3a53a753065e73afb30fd84f253ad31d5fb3d48662 WHIRLPOOL 022b214b6340365490915b5c873e515bf16be90d04cd32f09024a3607c23edc2c2e241d295102f045bd08a442c4e5aaf134ac89f7e59a027ec1633330a95989b |
| 28 |
DIST llvm-3.6.2.src.tar.xz 12802380 SHA256 f60dc158bfda6822de167e87275848969f0558b3134892ff54fced87e4667b94 SHA512 42b44ce69cfb96e2dc12dc2246f0de8ff983a99741206e2c46ccf074b3248aaab9c0f22c6baad802de851d06f202f40db9dd62fe38aab4479b3f70026c936b36 WHIRLPOOL 1a15e16793fe4120f1c14a5334362c36db26745c493e7289281351b7c18c523d781ff9425dddfe1a2add9ea1e8aebb92f2313787da5f286259b55b0884b3039f |
| 29 |
|
| 30 |
diff --git a/sys-devel/llvm/files/3.5.2/clang/gentoo-install.patch b/sys-devel/llvm/files/3.5.2/clang/gentoo-install.patch |
| 31 |
deleted file mode 100644 |
| 32 |
index 5d4261d0b48..00000000000 |
| 33 |
--- a/sys-devel/llvm/files/3.5.2/clang/gentoo-install.patch |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,57 +0,0 @@ |
| 36 |
---- |
| 37 |
- tools/clang/lib/Driver/Tools.cpp | 2 +- |
| 38 |
- tools/clang/tools/scan-build/scan-build | 4 ++-- |
| 39 |
- tools/clang/tools/scan-view/scan-view | 2 +- |
| 40 |
- 3 files changed, 4 insertions(+), 4 deletions(-) |
| 41 |
- |
| 42 |
-diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp |
| 43 |
-index 187ed38..55bcd99 100644 |
| 44 |
---- a/tools/clang/lib/Driver/Tools.cpp |
| 45 |
-+++ b/tools/clang/lib/Driver/Tools.cpp |
| 46 |
-@@ -1404,7 +1404,7 @@ static void AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args, |
| 47 |
- // as gold requires -plugin to come before any -plugin-opt that -Wl might |
| 48 |
- // forward. |
| 49 |
- CmdArgs.push_back("-plugin"); |
| 50 |
-- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; |
| 51 |
-+ std::string Plugin = ToolChain.getDriver().Dir + "/../@libdir@/LLVMgold.so"; |
| 52 |
- CmdArgs.push_back(Args.MakeArgString(Plugin)); |
| 53 |
- |
| 54 |
- // Try to pass driver level flags relevant to LTO code generation down to |
| 55 |
-diff --git a/tools/clang/tools/scan-build/scan-build b/tools/clang/tools/scan-build/scan-build |
| 56 |
-index 0f119f6..58f78d9 100755 |
| 57 |
---- a/tools/clang/tools/scan-build/scan-build |
| 58 |
-+++ b/tools/clang/tools/scan-build/scan-build |
| 59 |
-@@ -419,7 +419,7 @@ |
| 60 |
- |
| 61 |
- my $Dir = shift; |
| 62 |
- |
| 63 |
-- my $JS = Cwd::realpath("$RealBin/sorttable.js"); |
| 64 |
-+ my $JS = Cwd::realpath("@EPREFIX@/usr/share/llvm/sorttable.js"); |
| 65 |
- |
| 66 |
- DieDiag("Cannot find 'sorttable.js'.\n") |
| 67 |
- if (! -r $JS); |
| 68 |
-@@ -429,7 +429,7 @@ |
| 69 |
- DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n") |
| 70 |
- if (! -r "$Dir/sorttable.js"); |
| 71 |
- |
| 72 |
-- my $CSS = Cwd::realpath("$RealBin/scanview.css"); |
| 73 |
-+ my $CSS = Cwd::realpath("@EPREFIX@/usr/share/llvm/scanview.css"); |
| 74 |
- |
| 75 |
- DieDiag("Cannot find 'scanview.css'.\n") |
| 76 |
- if (! -r $CSS); |
| 77 |
-diff --git a/tools/clang/tools/scan-view/scan-view b/tools/clang/tools/scan-view/scan-view |
| 78 |
-index fb27da6..1f8ddb8 100755 |
| 79 |
---- a/tools/clang/tools/scan-view/scan-view |
| 80 |
-+++ b/tools/clang/tools/scan-view/scan-view |
| 81 |
-@@ -54,7 +54,7 @@ def start_browser(port, options): |
| 82 |
- webbrowser.open(url) |
| 83 |
- |
| 84 |
- def run(port, options, root): |
| 85 |
-- import ScanView |
| 86 |
-+ from clang import ScanView |
| 87 |
- try: |
| 88 |
- print 'Starting scan-view at: http://%s:%d'%(options.host, |
| 89 |
- port) |
| 90 |
--- |
| 91 |
-1.8.4.4 |
| 92 |
- |
| 93 |
|
| 94 |
diff --git a/sys-devel/llvm/files/3.5.2/gcc-5.1.patch b/sys-devel/llvm/files/3.5.2/gcc-5.1.patch |
| 95 |
deleted file mode 100644 |
| 96 |
index 7cb2817561c..00000000000 |
| 97 |
--- a/sys-devel/llvm/files/3.5.2/gcc-5.1.patch |
| 98 |
+++ /dev/null |
| 99 |
@@ -1,14 +0,0 @@ |
| 100 |
-Index: include/llvm/ADT/IntrusiveRefCntPtr.h |
| 101 |
-=================================================================== |
| 102 |
---- include/llvm/ADT/IntrusiveRefCntPtr.h (revision 218294) |
| 103 |
-+++ include/llvm/ADT/IntrusiveRefCntPtr.h (revision 218295) |
| 104 |
-@@ -197,6 +197,9 @@ |
| 105 |
- private: |
| 106 |
- void retain() { if (Obj) IntrusiveRefCntPtrInfo<T>::retain(Obj); } |
| 107 |
- void release() { if (Obj) IntrusiveRefCntPtrInfo<T>::release(Obj); } |
| 108 |
-+ |
| 109 |
-+ template <typename X> |
| 110 |
-+ friend class IntrusiveRefCntPtr; |
| 111 |
- }; |
| 112 |
- |
| 113 |
- template<class T, class U> |
| 114 |
|
| 115 |
diff --git a/sys-devel/llvm/files/3.5.2/gentoo-install.patch b/sys-devel/llvm/files/3.5.2/gentoo-install.patch |
| 116 |
deleted file mode 100644 |
| 117 |
index 7a8c9f7dfc1..00000000000 |
| 118 |
--- a/sys-devel/llvm/files/3.5.2/gentoo-install.patch |
| 119 |
+++ /dev/null |
| 120 |
@@ -1,83 +0,0 @@ |
| 121 |
-From b8846d389ff5e2b768a114f752cf39788accba26 Mon Sep 17 00:00:00 2001 |
| 122 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 123 |
-Date: Mon, 19 Aug 2013 13:22:46 +0200 |
| 124 |
-Subject: [PATCH] gentoo install fixes |
| 125 |
- |
| 126 |
---- |
| 127 |
- Makefile.config.in | 6 +++--- |
| 128 |
- Makefile.rules | 6 +++--- |
| 129 |
- tools/llvm-config/BuildVariables.inc.in | 2 ++ |
| 130 |
- tools/llvm-config/Makefile | 4 ++++ |
| 131 |
- tools/llvm-config/llvm-config.cpp | 5 +++-- |
| 132 |
- utils/FileCheck/Makefile | 2 +- |
| 133 |
- 7 files changed, 17 insertions(+), 10 deletions(-) |
| 134 |
- |
| 135 |
-diff --git a/Makefile.config.in b/Makefile.config.in |
| 136 |
-index dcca45f..e75ae2e 100644 |
| 137 |
---- a/Makefile.config.in |
| 138 |
-+++ b/Makefile.config.in |
| 139 |
-@@ -95,10 +95,10 @@ PROJ_internal_prefix := $(prefix) |
| 140 |
- endif |
| 141 |
- |
| 142 |
- PROJ_bindir := $(PROJ_prefix)/bin |
| 143 |
--PROJ_libdir := $(PROJ_prefix)/lib |
| 144 |
-+PROJ_libdir := $(PROJ_prefix)/$(GENTOO_LIBDIR) |
| 145 |
- PROJ_datadir := $(PROJ_prefix)/share |
| 146 |
--PROJ_docsdir := $(PROJ_prefix)/docs/llvm |
| 147 |
--PROJ_etcdir := $(PROJ_prefix)/etc/llvm |
| 148 |
-+PROJ_docsdir := $(PROJ_prefix)/share/doc/@PF@ |
| 149 |
-+PROJ_etcdir := @EPREFIX@/etc/llvm |
| 150 |
- PROJ_includedir := $(PROJ_prefix)/include |
| 151 |
- PROJ_infodir := $(PROJ_prefix)/info |
| 152 |
- PROJ_mandir := $(PROJ_prefix)/share/man |
| 153 |
-diff --git a/Makefile.rules b/Makefile.rules |
| 154 |
-index e53598b..217f754 100644 |
| 155 |
---- a/Makefile.rules |
| 156 |
-+++ b/Makefile.rules |
| 157 |
-@@ -275,7 +275,7 @@ ifeq ($(ENABLE_OPTIMIZED),1) |
| 158 |
- BuildMode := Release |
| 159 |
- # Don't use -fomit-frame-pointer on Darwin or FreeBSD. |
| 160 |
- ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin Darwin DragonFly FreeBSD GNU/kFreeBSD)) |
| 161 |
-- OmitFramePointer := -fomit-frame-pointer |
| 162 |
-+ OmitFramePointer := |
| 163 |
- endif |
| 164 |
- |
| 165 |
- CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer) |
| 166 |
-diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in |
| 167 |
-index fe87afb..fd9f2c6 100644 |
| 168 |
---- a/tools/llvm-config/BuildVariables.inc.in |
| 169 |
-+++ b/tools/llvm-config/BuildVariables.inc.in |
| 170 |
-@@ -25,3 +25,4 @@ |
| 171 |
- #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" |
| 172 |
- #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" |
| 173 |
- #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" |
| 174 |
-+#define LLVM_LIBDIR "@LLVM_LIBDIR@" |
| 175 |
-diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile |
| 176 |
-index b20b6bf..fc56781 100644 |
| 177 |
---- a/tools/llvm-config/Makefile |
| 178 |
-+++ b/tools/llvm-config/Makefile |
| 179 |
-@@ -55,6 +55,8 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir |
| 180 |
- >> temp.sed |
| 181 |
- $(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \ |
| 182 |
- >> temp.sed |
| 183 |
-+ $(Verb) $(ECHO) 's/@LLVM_LIBDIR@/$(subst /,\/,$(GENTOO_LIBDIR))/' \ |
| 184 |
-+ >> temp.sed |
| 185 |
- $(Verb) $(SED) -f temp.sed < $< > $@ |
| 186 |
- $(Verb) $(RM) temp.sed |
| 187 |
- |
| 188 |
-diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp |
| 189 |
-index 3924e2e..f439c60 100644 |
| 190 |
---- a/tools/llvm-config/llvm-config.cpp |
| 191 |
-+++ b/tools/llvm-config/llvm-config.cpp |
| 192 |
-@@ -250,7 +250,7 @@ int main(int argc, char **argv) { |
| 193 |
- ActivePrefix = CurrentExecPrefix; |
| 194 |
- ActiveIncludeDir = ActivePrefix + "/include"; |
| 195 |
- ActiveBinDir = ActivePrefix + "/bin"; |
| 196 |
-- ActiveLibDir = ActivePrefix + "/lib"; |
| 197 |
-+ ActiveLibDir = ActivePrefix + "/" LLVM_LIBDIR; |
| 198 |
- ActiveIncludeOption = "-I" + ActiveIncludeDir; |
| 199 |
- } |
| 200 |
- |
| 201 |
--- |
| 202 |
-1.8.4.2 |
| 203 |
- |
| 204 |
|
| 205 |
diff --git a/sys-devel/llvm/llvm-3.5.2-r100.ebuild b/sys-devel/llvm/llvm-3.5.2-r100.ebuild |
| 206 |
index f956d83cf50..07457902436 100644 |
| 207 |
--- a/sys-devel/llvm/llvm-3.5.2-r100.ebuild |
| 208 |
+++ b/sys-devel/llvm/llvm-3.5.2-r100.ebuild |
| 209 |
@@ -12,7 +12,8 @@ HOMEPAGE="http://llvm.org/" |
| 210 |
SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz |
| 211 |
clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz |
| 212 |
http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz ) |
| 213 |
- https://dev.gentoo.org/~voyageur/distfiles/${PN}-3.5.0-manpages.tar.bz2" |
| 214 |
+ https://dev.gentoo.org/~voyageur/distfiles/${PN}-3.5.0-manpages.tar.bz2 |
| 215 |
+ https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.gz" |
| 216 |
|
| 217 |
# Additional licenses: |
| 218 |
# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD. |
| 219 |
@@ -111,17 +112,17 @@ src_unpack() { |
| 220 |
} |
| 221 |
|
| 222 |
src_prepare() { |
| 223 |
- epatch "${FILESDIR}"/3.6.2/nodoctargz.patch |
| 224 |
- epatch "${FILESDIR}"/3.6.2/gcc-4.9.patch |
| 225 |
- epatch "${FILESDIR}"/3.5.2/gentoo-install.patch |
| 226 |
- epatch "${FILESDIR}"/3.5.2/gcc-5.1.patch |
| 227 |
+ epatch "${WORKDIR}/${P}-patchset"/nodoctargz.patch |
| 228 |
+ epatch "${WORKDIR}/${P}-patchset"/gcc-4.9.patch |
| 229 |
+ epatch "${WORKDIR}/${P}-patchset"/gentoo-install.patch |
| 230 |
+ epatch "${WORKDIR}/${P}-patchset"/gcc-5.1.patch |
| 231 |
|
| 232 |
if use clang; then |
| 233 |
# Automatically select active system GCC's libraries, bugs #406163 and #417913 |
| 234 |
- epatch "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch |
| 235 |
+ epatch "${WORKDIR}/${P}-patchset"/clang/gentoo-runtime-gcc-detection-v3.patch |
| 236 |
|
| 237 |
- epatch "${FILESDIR}"/3.5.2/clang/gentoo-install.patch |
| 238 |
- epatch "${FILESDIR}"/3.9.1/clang/darwin_prefix-include-paths.patch |
| 239 |
+ epatch "${WORKDIR}/${P}-patchset"/clang/gentoo-install.patch |
| 240 |
+ epatch "${WORKDIR}/${P}-patchset"/clang/darwin_prefix-include-paths.patch |
| 241 |
eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp |
| 242 |
fi |
Archives