diff options
author | Michał Górny <mgorny@gentoo.org> | 2017-06-03 11:04:50 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2017-06-03 12:27:49 +0200 |
commit | 83d24922608136fa2400002fbf4268584b992f90 (patch) | |
tree | 1e514df155f4afc46650be9cfd517f39e0017ae0 | |
parent | sys-devel/llvm: Move 3.4.2 patchset to tarball (diff) | |
download | gentoo-83d24922608136fa2400002fbf4268584b992f90.tar.gz gentoo-83d24922608136fa2400002fbf4268584b992f90.tar.bz2 gentoo-83d24922608136fa2400002fbf4268584b992f90.zip |
sys-devel/llvm: Move 3.5.2 patchset to tarball
-rw-r--r-- | sys-devel/llvm/Manifest | 1 | ||||
-rw-r--r-- | sys-devel/llvm/files/3.5.2/clang/gentoo-install.patch | 57 | ||||
-rw-r--r-- | sys-devel/llvm/files/3.5.2/gcc-5.1.patch | 14 | ||||
-rw-r--r-- | sys-devel/llvm/files/3.5.2/gentoo-install.patch | 83 | ||||
-rw-r--r-- | sys-devel/llvm/llvm-3.5.2-r100.ebuild | 17 |
5 files changed, 10 insertions, 162 deletions
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index ea4cd6bdd9d6..1b38130c1024 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -20,6 +20,7 @@ DIST llvm-3.4-manpages.tar.bz2 33753 SHA256 dc2616104cf333dd9ef56b2d31f9a36e8130 DIST llvm-3.4.2-patchset.tar.gz 4612 SHA256 ec5d12763c0181ae0ff7485b08a69b621a988df278fcb3ae009551d637da824c SHA512 32c7cf229a6a8917f0fc67efa1fb11994945281f6906395cee7e5c51399c8fb4c06f554a03253c8f9073890a7bc7af151a8adfe887ad62f45f1523e6e358f769 WHIRLPOOL 408d1b2e55aa14acd3ae34918d164a53ebc3eddf8e3f8e77deb52acbab9e76bf94365d94c34ad6155d2537739a7fffab1b7f088be7d25ba77dd1796164f77721 DIST llvm-3.4.2.src.tar.gz 15938155 SHA256 17038d47069ad0700c063caed76f0c7259628b0e79651ce2b540d506f2f1efd7 SHA512 6c1453f7d9d9110257db3574cc4f6227fed8938705cbb09851ac09a868089b48f1556a1b6e758aff6d97520b08b5605d3ed20411ad9dd22cdc573d62176905f0 WHIRLPOOL f8b4d5167469e6f350ec41aede04e7b756e18f3d8e78b3270beb5791310a7b9b13c69e57c8bcfefbd0a78efc0c40e3b75a9a158eac72c025b7c77146e8dfaf7c DIST llvm-3.5.0-manpages.tar.bz2 35314 SHA256 724e752a60016dce8cc536658906d3646c600e977374e0ea692a5d0fe2d4a021 SHA512 d99d6096d7f21a81923297584fe5eeb23e0d83d4538fe376615c92fffc8aff3189999f7ab3c537b5aa5d6bc2c22c53eb05717d48c7ab99c42315b8665bac62c3 WHIRLPOOL 68ced06ee6678c5333c662eb1cc0da744c5a184b12dd059c1b77ec200b1d3cc231f270b9d9b6e177d728776894277b3f9061338aa55620c90474eb97915b7819 +DIST llvm-3.5.2-patchset.tar.gz 4568 SHA256 9a987625d5d5a06cbf2733c68815ae0083a7bba30be7c53c3cda996ab61df52e SHA512 6df5a61d3e949dbe9840e713eb90e7514760c5ae68e241494d0246925015ac7e9d73671dd0646eb44d2d9232665027783d02c00639f41385615ec541d4e2fa93 WHIRLPOOL a34e09f22b62b12adcf3d948a2e9769868f70cc0692feb8e574a224999e74edea6bf82c16b48fa658de0f06f6d7f6987e8e8dd1d65cdf9b6a0d0bdf7ee3cdaab DIST llvm-3.5.2.src.tar.xz 11876128 SHA256 44196156d5749eb4b4224fe471a29cc3984df92570a4a89fa859f7394fc0c575 SHA512 0f6a83cc61a385387e7baf8fb8f0d9f18e3fd00d2d389a3c7e2c3792be7d82ed095506cac52c24e65ae3c1f94456a441d39440feef6125e25ef18447ec9dd406 WHIRLPOOL b41de51907d6d2c2d04a4c498b44f0ed560cc710e6e2d8678f5ef93a9009d140bc7c2406f4b25d5b901fd026689d48edce77a2e435687b489b835156a512e256 DIST llvm-3.6.1-manpages.tar.bz2 38338 SHA256 b27c6198e09b11421841a7184d4e8a0f8878d4f1313405da28d643134a55688a SHA512 a47aeb0b4632329eaaa1d6c774446fea5822d7692d81533a9a5c5de1c6a3b37fdd6b7c1fc6433339649f4d3a53a753065e73afb30fd84f253ad31d5fb3d48662 WHIRLPOOL 022b214b6340365490915b5c873e515bf16be90d04cd32f09024a3607c23edc2c2e241d295102f045bd08a442c4e5aaf134ac89f7e59a027ec1633330a95989b DIST llvm-3.6.2.src.tar.xz 12802380 SHA256 f60dc158bfda6822de167e87275848969f0558b3134892ff54fced87e4667b94 SHA512 42b44ce69cfb96e2dc12dc2246f0de8ff983a99741206e2c46ccf074b3248aaab9c0f22c6baad802de851d06f202f40db9dd62fe38aab4479b3f70026c936b36 WHIRLPOOL 1a15e16793fe4120f1c14a5334362c36db26745c493e7289281351b7c18c523d781ff9425dddfe1a2add9ea1e8aebb92f2313787da5f286259b55b0884b3039f 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 deleted file mode 100644 index 5d4261d0b48b..000000000000 --- a/sys-devel/llvm/files/3.5.2/clang/gentoo-install.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- - tools/clang/lib/Driver/Tools.cpp | 2 +- - tools/clang/tools/scan-build/scan-build | 4 ++-- - tools/clang/tools/scan-view/scan-view | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp -index 187ed38..55bcd99 100644 ---- a/tools/clang/lib/Driver/Tools.cpp -+++ b/tools/clang/lib/Driver/Tools.cpp -@@ -1404,7 +1404,7 @@ static void AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args, - // as gold requires -plugin to come before any -plugin-opt that -Wl might - // forward. - CmdArgs.push_back("-plugin"); -- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; -+ std::string Plugin = ToolChain.getDriver().Dir + "/../@libdir@/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); - - // Try to pass driver level flags relevant to LTO code generation down to -diff --git a/tools/clang/tools/scan-build/scan-build b/tools/clang/tools/scan-build/scan-build -index 0f119f6..58f78d9 100755 ---- a/tools/clang/tools/scan-build/scan-build -+++ b/tools/clang/tools/scan-build/scan-build -@@ -419,7 +419,7 @@ - - my $Dir = shift; - -- my $JS = Cwd::realpath("$RealBin/sorttable.js"); -+ my $JS = Cwd::realpath("@EPREFIX@/usr/share/llvm/sorttable.js"); - - DieDiag("Cannot find 'sorttable.js'.\n") - if (! -r $JS); -@@ -429,7 +429,7 @@ - DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n") - if (! -r "$Dir/sorttable.js"); - -- my $CSS = Cwd::realpath("$RealBin/scanview.css"); -+ my $CSS = Cwd::realpath("@EPREFIX@/usr/share/llvm/scanview.css"); - - DieDiag("Cannot find 'scanview.css'.\n") - if (! -r $CSS); -diff --git a/tools/clang/tools/scan-view/scan-view b/tools/clang/tools/scan-view/scan-view -index fb27da6..1f8ddb8 100755 ---- a/tools/clang/tools/scan-view/scan-view -+++ b/tools/clang/tools/scan-view/scan-view -@@ -54,7 +54,7 @@ def start_browser(port, options): - webbrowser.open(url) - - def run(port, options, root): -- import ScanView -+ from clang import ScanView - try: - print 'Starting scan-view at: http://%s:%d'%(options.host, - port) --- -1.8.4.4 - 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 deleted file mode 100644 index 7cb2817561c1..000000000000 --- a/sys-devel/llvm/files/3.5.2/gcc-5.1.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: include/llvm/ADT/IntrusiveRefCntPtr.h -=================================================================== ---- include/llvm/ADT/IntrusiveRefCntPtr.h (revision 218294) -+++ include/llvm/ADT/IntrusiveRefCntPtr.h (revision 218295) -@@ -197,6 +197,9 @@ - private: - void retain() { if (Obj) IntrusiveRefCntPtrInfo<T>::retain(Obj); } - void release() { if (Obj) IntrusiveRefCntPtrInfo<T>::release(Obj); } -+ -+ template <typename X> -+ friend class IntrusiveRefCntPtr; - }; - - template<class T, class U> diff --git a/sys-devel/llvm/files/3.5.2/gentoo-install.patch b/sys-devel/llvm/files/3.5.2/gentoo-install.patch deleted file mode 100644 index 7a8c9f7dfc1c..000000000000 --- a/sys-devel/llvm/files/3.5.2/gentoo-install.patch +++ /dev/null @@ -1,83 +0,0 @@ -From b8846d389ff5e2b768a114f752cf39788accba26 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 19 Aug 2013 13:22:46 +0200 -Subject: [PATCH] gentoo install fixes - ---- - Makefile.config.in | 6 +++--- - Makefile.rules | 6 +++--- - tools/llvm-config/BuildVariables.inc.in | 2 ++ - tools/llvm-config/Makefile | 4 ++++ - tools/llvm-config/llvm-config.cpp | 5 +++-- - utils/FileCheck/Makefile | 2 +- - 7 files changed, 17 insertions(+), 10 deletions(-) - -diff --git a/Makefile.config.in b/Makefile.config.in -index dcca45f..e75ae2e 100644 ---- a/Makefile.config.in -+++ b/Makefile.config.in -@@ -95,10 +95,10 @@ PROJ_internal_prefix := $(prefix) - endif - - PROJ_bindir := $(PROJ_prefix)/bin --PROJ_libdir := $(PROJ_prefix)/lib -+PROJ_libdir := $(PROJ_prefix)/$(GENTOO_LIBDIR) - PROJ_datadir := $(PROJ_prefix)/share --PROJ_docsdir := $(PROJ_prefix)/docs/llvm --PROJ_etcdir := $(PROJ_prefix)/etc/llvm -+PROJ_docsdir := $(PROJ_prefix)/share/doc/@PF@ -+PROJ_etcdir := @EPREFIX@/etc/llvm - PROJ_includedir := $(PROJ_prefix)/include - PROJ_infodir := $(PROJ_prefix)/info - PROJ_mandir := $(PROJ_prefix)/share/man -diff --git a/Makefile.rules b/Makefile.rules -index e53598b..217f754 100644 ---- a/Makefile.rules -+++ b/Makefile.rules -@@ -275,7 +275,7 @@ ifeq ($(ENABLE_OPTIMIZED),1) - BuildMode := Release - # Don't use -fomit-frame-pointer on Darwin or FreeBSD. - ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin Darwin DragonFly FreeBSD GNU/kFreeBSD)) -- OmitFramePointer := -fomit-frame-pointer -+ OmitFramePointer := - endif - - CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer) -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index fe87afb..fd9f2c6 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_LIBDIR "@LLVM_LIBDIR@" -diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile -index b20b6bf..fc56781 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_LIBDIR@/$(subst /,\/,$(GENTOO_LIBDIR))/' \ -+ >> 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..f439c60 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) { - ActivePrefix = CurrentExecPrefix; - ActiveIncludeDir = ActivePrefix + "/include"; - ActiveBinDir = ActivePrefix + "/bin"; -- ActiveLibDir = ActivePrefix + "/lib"; -+ ActiveLibDir = ActivePrefix + "/" LLVM_LIBDIR; - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - --- -1.8.4.2 - diff --git a/sys-devel/llvm/llvm-3.5.2-r100.ebuild b/sys-devel/llvm/llvm-3.5.2-r100.ebuild index f956d83cf502..07457902436e 100644 --- a/sys-devel/llvm/llvm-3.5.2-r100.ebuild +++ b/sys-devel/llvm/llvm-3.5.2-r100.ebuild @@ -12,7 +12,8 @@ HOMEPAGE="http://llvm.org/" SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz ) - https://dev.gentoo.org/~voyageur/distfiles/${PN}-3.5.0-manpages.tar.bz2" + https://dev.gentoo.org/~voyageur/distfiles/${PN}-3.5.0-manpages.tar.bz2 + https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.gz" # Additional licenses: # 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD. @@ -111,17 +112,17 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}"/3.6.2/nodoctargz.patch - epatch "${FILESDIR}"/3.6.2/gcc-4.9.patch - epatch "${FILESDIR}"/3.5.2/gentoo-install.patch - epatch "${FILESDIR}"/3.5.2/gcc-5.1.patch + epatch "${WORKDIR}/${P}-patchset"/nodoctargz.patch + epatch "${WORKDIR}/${P}-patchset"/gcc-4.9.patch + epatch "${WORKDIR}/${P}-patchset"/gentoo-install.patch + epatch "${WORKDIR}/${P}-patchset"/gcc-5.1.patch if use clang; then # Automatically select active system GCC's libraries, bugs #406163 and #417913 - epatch "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch + epatch "${WORKDIR}/${P}-patchset"/clang/gentoo-runtime-gcc-detection-v3.patch - epatch "${FILESDIR}"/3.5.2/clang/gentoo-install.patch - epatch "${FILESDIR}"/3.9.1/clang/darwin_prefix-include-paths.patch + epatch "${WORKDIR}/${P}-patchset"/clang/gentoo-install.patch + epatch "${WORKDIR}/${P}-patchset"/clang/darwin_prefix-include-paths.patch eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp fi |