diff options
author | Steve Arnold <stephen.arnold42@gmail.com> | 2015-07-25 23:11:34 -0700 |
---|---|---|
committer | Steve Arnold <stephen.arnold42@gmail.com> | 2015-07-25 23:11:34 -0700 |
commit | 0979da9be961f8d6a6ea9718525a2182d82d9be6 (patch) | |
tree | f267e763f197823960712febf63357ed8db4b5ec /sys-devel | |
parent | updated readme and layman config to point to new repo location (diff) | |
download | arm-0979da9be961f8d6a6ea9718525a2182d82d9be6.tar.gz arm-0979da9be961f8d6a6ea9718525a2182d82d9be6.tar.bz2 arm-0979da9be961f8d6a6ea9718525a2182d82d9be6.zip |
updated patches as temp fix
Diffstat (limited to 'sys-devel')
-rw-r--r-- | sys-devel/llvm/Manifest | 6 | ||||
-rw-r--r-- | sys-devel/llvm/files/clang-3.5-gentoo-install.patch | 57 | ||||
-rw-r--r-- | sys-devel/llvm/files/clang-9999-gentoo-install.patch | 51 | ||||
-rw-r--r-- | sys-devel/llvm/files/llvm-9999-nodoctargz.patch | 48 | ||||
-rw-r--r-- | sys-devel/llvm/llvm-9999.ebuild | 7 |
5 files changed, 104 insertions, 65 deletions
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest deleted file mode 100644 index 8393508..0000000 --- a/sys-devel/llvm/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX clang-3.5-gentoo-install.patch 2166 SHA256 e359a219f2d0d2b88094bbb5ab91fd50d9662686f77e85b7ccfb8d1c4a6fd39d SHA512 07e5b3d4131a7d58577bcb99a82c585258c98a38e71b7e8dda058b467a558471e1ddeec5c9f5492f5d17e280cd4b09e49338e0926dd2534583bc8a2772bce26d WHIRLPOOL 5582b2015b4d3e845a45bfda08c156683df11685170f253f79ccf016f2e771b016d213417d83068f01a41bd8e0148474711cd6f9b7187e758322e9ebb9c390dd -AUX clang-3.5-gentoo-runtime-gcc-detection-v3.patch 1694 SHA256 24691db819d08f87f0144a67900ae6797c0df4d180b55acc5c377d890ac2e72e SHA512 a34f694560ef0c7366ad0dc243a479afc74b6122d624b8681538da69c70d0d1869245a89c61d49add890c5f76134281470f5e75a59e6fc9ac963230fc56fe8e6 WHIRLPOOL 4f4af09e08c7d5af89558e77d0a2a4542f77ae505e9020ca6e48e20ef71c4db6016ed0211b2a303b756994f62949c91c216cc2f81b16ff65c71414d354977c8f -AUX llvm-3.2-nodoctargz.patch 1761 SHA256 e17494aef638d2fe3fb0b669516ffcc9e560161903e1e165de0eecba684c8c1b SHA512 d12a8996d8a1160f7bad4ce3b3a9ddfb2d29d91fc160876c145f9241927b0cf4413f3b29bc2bf291f0421f61a512de8057e8f3d0029a8a09ba3f1d93582723b5 WHIRLPOOL be273271db8293829a63120cfc917711c99d8893cae6f95af2583def735131f629ee67b5a1515df007477f34abeaf5f2729d689eefdc61eb3aae6b1959971507 -AUX llvm-3.5-gcc-4.9.patch 1722 SHA256 c73f64311ff67534b581729b3ef0fecf452b86961c3b668ac2e6b50f1eff0bd2 SHA512 5ad0a742fca3eb9e08a183af9f90370baf85528bba6f3083d19592fe2a704950ca8c6bf9e930f9834255de3fc5832c49a06c9ca29a66e45928d9047abd9ad8ac WHIRLPOOL dac24fcb47d8b094ffa6b4403dbd7604901dd0f5ef6665a882380109584e4de815b2f277e05d44c05e1a3d22a7003075b2b2649f3f614f299b38bc6d594400ae -AUX llvm-3.6-gentoo-install.patch 3169 SHA256 318288e667623e22c441f7a1da8c3e27b3fff7426839a58a05e43dd0ac37d443 SHA512 9e13fd8606c6aa636d5e1cd3e32781fa4cae3266acf306f5c38f052a7520fc4b603022244b4502045d968c9ca28292539a17caa33b9b470353adfdbb8e159321 WHIRLPOOL 8f3b9b5150d2a29ba4f94a86235d12cf96c1a28ceb7f55fe7b90b3e5e074fe4883d449ac34cbe823ccc22f1ab8b3e2d05dadb39abaaac0a17e3870bbba1ea14e -EBUILD llvm-9999.ebuild 14697 SHA256 12898efb3f2fd1fd9c684e98cd5e1eefbdc0024d59b714b055c1c107872f8831 SHA512 d3106181eddcf2122cebfec811ef4d4171f647bda87cdbd532169d9522c68904af36f173bb8a57f8e832cd7aa9f9cc35ea9bb6067c9ba05b580aed2d2cb2673f WHIRLPOOL 0b799c5d0ce2b03a7486b5a7bd891b953b75a19d39fe857a6b98d14dd76f4272e318e2bac811e8778223b5b536ed301229003c182bc9eedcbdbe42622bf97654 diff --git a/sys-devel/llvm/files/clang-3.5-gentoo-install.patch b/sys-devel/llvm/files/clang-3.5-gentoo-install.patch deleted file mode 100644 index 5d4261d..0000000 --- a/sys-devel/llvm/files/clang-3.5-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/clang-9999-gentoo-install.patch b/sys-devel/llvm/files/clang-9999-gentoo-install.patch new file mode 100644 index 0000000..4e97253 --- /dev/null +++ b/sys-devel/llvm/files/clang-9999-gentoo-install.patch @@ -0,0 +1,51 @@ +--- tools/clang/lib/Driver/Tools.cpp.orig 2015-07-25 22:17:56.489628405 -0700 ++++ tools/clang/lib/Driver/Tools.cpp 2015-07-25 22:21:43.173439848 -0700 +@@ -1540,7 +1540,7 @@ + // forward. + CmdArgs.push_back("-plugin"); + std::string Plugin = +- ToolChain.getDriver().Dir + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold.so"; ++ 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 +--- tools/clang/tools/scan-build/scan-build.orig 2015-07-25 22:21:59.843965110 -0700 ++++ tools/clang/tools/scan-build/scan-build 2015-07-25 22:23:23.193258335 -0700 +@@ -437,7 +437,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); +@@ -447,7 +447,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); +--- tools/clang/tools/scan-view/scan-view.orig 2015-07-25 22:23:50.107439931 -0700 ++++ tools/clang/tools/scan-view/scan-view 2015-07-25 22:24:46.702557184 -0700 +@@ -34,7 +34,7 @@ + import urllib, webbrowser + + url = 'http://%s:%d'%(options.host, port) +- ++ + # Wait for server to start... + if options.debug: + sys.stderr.write('%s: Waiting for server.' % sys.argv[0]) +@@ -54,7 +54,7 @@ + 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) diff --git a/sys-devel/llvm/files/llvm-9999-nodoctargz.patch b/sys-devel/llvm/files/llvm-9999-nodoctargz.patch new file mode 100644 index 0000000..033d393 --- /dev/null +++ b/sys-devel/llvm/files/llvm-9999-nodoctargz.patch @@ -0,0 +1,48 @@ +--- docs/Makefile.orig 2015-07-25 21:59:05.630615076 -0700 ++++ docs/Makefile 2015-07-25 22:01:57.729405144 -0700 +@@ -62,11 +62,10 @@ + # 'make generated BUILD_FOR_WEBSITE=1' + generated:: $(generated_targets) + +-install-html: $(PROJ_OBJ_DIR)/html.tar.gz ++install-html: + $(Echo) Installing HTML documentation + $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html + $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html +- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir) + + $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) + $(Echo) Packaging HTML documentation +@@ -77,7 +76,6 @@ + + install-doxygen: doxygen + $(Echo) Installing doxygen documentation +- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) + $(Verb) cd $(PROJ_OBJ_DIR)/doxygen/html && \ + for DIR in $$($(FIND) . -type d); do \ + DESTSUB="$(DESTDIR)$(PROJ_docsdir)/html/doxygen/$$(echo $$DIR | cut -c 3-)"; \ +@@ -86,7 +84,7 @@ + if [ $$? != 0 ]; then exit 1; fi \ + done + +-doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz ++doxygen: regendoc + + regendoc: + $(Echo) Building doxygen documentation +@@ -110,7 +108,6 @@ + install-ocamldoc: ocamldoc + $(Echo) Installing ocamldoc documentation + $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html +- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir) + $(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \ + $(FIND) . -type f -exec \ + $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \; +@@ -120,7 +117,6 @@ + $(Verb) $(RM) -rf $(PROJ_OBJ_DIR)/ocamldoc.tar* + $(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/ocamldoc.tar ocamldoc + $(Verb) $(GZIPBIN) $(PROJ_OBJ_DIR)/ocamldoc.tar +- $(Verb) $(CP) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_OBJ_DIR)/ocamldoc/html/ + + regen-ocamldoc: + $(Echo) Building ocamldoc documentation diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild index 504bbbd..cc330fc 100644 --- a/sys-devel/llvm/llvm-9999.ebuild +++ b/sys-devel/llvm/llvm-9999.ebuild @@ -67,6 +67,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # so why did it call itself ninja in the first place? CMAKE_MAKEFILE_GENERATOR=emake +## nodoctargz patch needs some fuzz... +EPATCH_OPTS="-F 3" + pkg_pretend() { # in megs # !clang !debug !multitarget -O2 400 @@ -143,7 +146,7 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch + epatch "${FILESDIR}"/${P}-nodoctargz.patch epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch epatch "${FILESDIR}"/${PN}-3.6-gentoo-install.patch @@ -151,7 +154,7 @@ src_prepare() { # Automatically select active system GCC's libraries, bugs #406163 and #417913 epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch - epatch "${FILESDIR}"/clang-3.5-gentoo-install.patch + epatch "${FILESDIR}"/clang-9999-gentoo-install.patch fi if use prefix && use clang; then |