Update LLVM build patch for -9999.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 107 insertions, 19 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index cac0c4373046..49db9d1496ab 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.153 2013/12/20 10:53:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.154 2013/12/20 13:18:30 mgorny Exp $
+
+  20 Dec 2013; Michał Górny <mgorny@gentoo.org>
+  +files/llvm-3.5-gentoo-install.patch, llvm-9999.ebuild:
+  Update LLVM build patch for -9999.
 
   20 Dec 2013; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild:
   Fix gcc version check. Add missing libxml2 dependency (for clang). Install
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 7c25f5b2406b..7dfd6c105594 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -28,6 +28,7 @@ AUX llvm-3.3-R600_debug.patch 909 SHA256 84ebe63a557e3734dc8ed4545f098e2496d815e
 AUX llvm-3.3-gentoo-install.patch 5321 SHA256 4f2e80f5567227e3539052a743ef0432f108d76e6fb9ba373dc51dbf159e0410 SHA512 90075d4bb5bdefb76bfb191dcb1b618de464434d9d084b2f99cc5034d33b112378f9aae1d289d30a2f8926132c17ea32ba1bf4049c3a61a418d37f903634b259 WHIRLPOOL 39b3ce4e937985483be7b4d19a37c0837b3c27f308f09fe8aee185b9fb43782b540f6b6be042b8f6dc4b5037be64284e2e233e65b3558e4b4eb1095a7d586a4f
 AUX llvm-3.3-insecure-rpath.patch 881 SHA256 27d893e5f551d245f15c01a94df81dd9ad069c2a980cf6a8860fb429eb37a5d8 SHA512 f03d1f522d0153fcbef677bf85202a6ddff408362d9ebc3e4f9f21814b43d28b033b0efb3ee86f5c11a4ac3a91b8afc80d022bddcd839ba503b29cf946e40218 WHIRLPOOL cfca8d189f88c0e26b4c3091db6c4267a90307c5728e64ee3ca55272a884389e56ed186904d9d66b44b870792eaae049cf6e66ee38efaf757655a4be4a0cec6e
 AUX llvm-3.4-gentoo-install.patch 3528 SHA256 fa2de6dd186091b255832a9b5cb654edddd4c4a16f0f138357c813a40aa9a75b SHA512 e946e1fd422f49d2e150bd641bac0ffe6ea6757b2e6119465090a3c7f5cf69e17c00221bcf67a7fcf29628d93463fb1c57d0d009ff7834151440d779f2d33484 WHIRLPOOL 171f167802ee289716232e16a2c507e3b8dc7913b40df29c55a815ff88596871a1a970c891b0e9b361186cada4d8898e65920d014b4e6eb2178cc207f61bf6da
+AUX llvm-3.5-gentoo-install.patch 3204 SHA256 0c97173613505ea92f0aa79d4e04e797f1917fdc33b34daee05752bb52336d53 SHA512 f60b04f1fc7798f7869f3d80e4c163086c398e01b81220d60ccff42be5899fa036d5ab95257933e89e4c5efd04267a09015917c6a617b86b82d7ab4f5d0de221 WHIRLPOOL 81ce5835b9eb1fe1b162f35d6e37762cc8d613e67c5791f078ecd0e354a87eb92e52452bd6e9a7f70953dabea99d197786e87ed64dc802223149b8e97d6de265
 DIST cfe-3.3.src.tar.gz 9425539 SHA256 b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996 SHA512 06773f43f7d3529f06edb029f7de398f06a700a0f2476e00c4727e70c291028221bfac23625dfd2c220d6ac91a21670848187a934b99a21801c695127371afcc WHIRLPOOL 8b97b527f19015dd3283b9e174615170e639793f64c635ccc4ee4d8216f8de759fd0121a8ef3513fa1c6ad19b31aa3529091ffb44a01ee858edfef400881596a
 DIST compiler-rt-3.3.src.tar.gz 1568034 SHA256 0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423 SHA512 3e86aa8ab9810b4fbac54a40fc93a717a55c642520858c0db215a5324c1e495b4d8fcec9620251cca8e4e5f9afa34bc14364d7f785880a0700469d0201827929 WHIRLPOOL fcfd06bc860dfd901a7576cd4309f863e9d4363e36ab4c67e9e08fe3c8a37d627ee95eb96b9ed53eb6047dec06e73181b3c3e1555b1b49f1e893e6382f21ddc1
 DIST llvm-2.8-r1.tgz 9112527 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b SHA512 8688d5cf415e8aef74cca6a14587af36234a6347e2238ac2c0d66805c42926b9399f36390e1a58a4081e902b0904adb818c1a360d5df572dfa893d6f79f5e35a WHIRLPOOL 0da9250e31242b55586c9138089e742aab5d414d5f3412ebf917ae8b9506f984c6134a932be93ec7e4c01c79f6c21d508cb0b2e0ec283419bd4ae4db745430ae
@@ -45,25 +46,25 @@ EBUILD llvm-3.1-r2.ebuild 6033 SHA256 9b9a587d30419fa646764a96e12fc6272f73f72461
 EBUILD llvm-3.2.ebuild 6534 SHA256 eb16cc91887fdb035722d268caaa3e4843825403786fcf74643be2c6f8099f11 SHA512 e781a4e4416a4acee667029744dab7f8e52022df4fcbb89d4d9acf855549f1c0a1661b79ee0067fd052a36bad278f08a2ff7f6e6e44d8c3ea7f82910ac573d9b WHIRLPOOL 115d13959a22867266dd7c0133109ccba063e97972cc2c807fb7a6dd7d3fbef1726caf314e262f6683a97a2c3a6ff776f808de7d80923472fc692554eccbca27
 EBUILD llvm-3.3-r1.ebuild 12007 SHA256 343a88ba35b67f4d86c20e29e1f4919640a9c4fbf9942fb1733945480ba1e8f5 SHA512 3db9e2ad26e803ac663b696ff615eed83a4342e4b771f161b74304bb83c61f171e02f2b176cf62663724206a57e20be52ec22cf49de234f72b32673bb2588512 WHIRLPOOL 1c423485f6161b40daa5a7ebdc38838b4bd2d6a9c540881eb3cfbf5f592b454da32758ad23c2607fe7a875c65891f7b64f3079a53ac77af5b2decb6490a6b8b4
 EBUILD llvm-3.3.ebuild 6798 SHA256 4e53042e76ce97e6a460cda74c5dbadc1cee9009345e8f0232e28d53c8f77579 SHA512 5513887c3b5a25a678713b68c216a40801ddecbf5a4dc58d7ad01c1ec8411589e20d8662c34f117e6d64924302504c8ce74b48f3edca1f292b56881eb6176271 WHIRLPOOL 79d6adefc281699477a271f76cb8eb7992d0946b6fcda9149a0976c30138ac882f735eff08c25c0edf37ccc8e31700f6d2d51d38c354c82c06695962e8f9243b
-EBUILD llvm-9999.ebuild 12807 SHA256 b9611bd472b40809fc7863e6e15207af1745ab7901568f5646982eded0cdf3de SHA512 5ab516ceff13a978dbd751216cbc77350ed31c9b06817331a14de0693ca84694ec3a045b87102b925ccac9f1aa5614668c7906ff3a4e9bdcd49b7e515615199c WHIRLPOOL 9d5f214674a477f79a62537b29548c801d4af6605a4f624958802285945aed2bc837e4133b82f288c89975b7375a5e1b6d97a1a7aa8b095bcb70cd6129f1d9e5
-MISC ChangeLog 25804 SHA256 c253937d9eee8bebce0f7362825bbdd898fc42f65a3fc6bd70d4c1c1cc2ca61d SHA512 5a8a78c1ac20b01116018ac4d9b5e64495e92d156040c4724635cbca6a01e09727e1b203c4ede8e0d588830a4bad8485ca1b2a10461218ece8ed6d3a36cb0966 WHIRLPOOL 6a9a557c91104e4d8d465b637e194c0509f4738f6a4e3db909711f7ee8b4c41eea05426eb7a31106a952b640360a1c397acdce5d1b527fab77a63f4d45e70e11
+EBUILD llvm-9999.ebuild 12807 SHA256 0aba2b12ab8642cc4f7976304b74a04e1bc64022e9c8ac25b50bffa5d19904c9 SHA512 6cf5e3628944b4c9427197a73e20fdf40a4e6eb6999262b77ca12a2f170fdd7ebd8267ff20d389af9f719272a22465c20bb7efb709b53acb87bebc276ac2f26c WHIRLPOOL 597d40dfec615833a1cdbf323d580c111eb2a46cdaa900eef516e932fcb1019a8c89f1a82f1d629f6f6e3763be33095a9942f126f331ca798c0512b2c38f78ce
+MISC ChangeLog 25950 SHA256 ec7c09078f3ade223fb8001f90c6a7edf4c2ff6f498a33db4e1fe454ca69aab2 SHA512 0f42af28f0169d8886a9c21588c821e63e8d01ebe43c811a2709f2881e5da1760a72c95b25c5035cc87945c7c746953c327e16adbb1a369c137324e843f82e62 WHIRLPOOL ed8c6127931c11bed94153ce1f64d94f77cf9f6c36afd478195746aef8b6ce6e329e438456c78b8fbba36e7b198381546caa4810d50378d09de2a38deb68c5bc
 MISC metadata.xml 2723 SHA256 d1bbe72da2553592ad60522f744b8339bce17487343abf372d966c1fe9cd163d SHA512 800f72039a5f0fdb175a8ddab7ae8f184907865802ffd5f139006f3a8c77053f114e2f7b01cef3f41f6fffb3f8f8b2b474fdf95461f27b2dc8ae31cbd732a14e WHIRLPOOL 462d3d2f22e29d3678621a9f89ed98a58ee60fde57da7be21fbca7fd61e106abbcb19c0e491424869302c19ca93b15c480cd7ca2a3181f2148174d44e891e190
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJStCHDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJStEOqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOA0oQAMPUB/h4NCMeT9XVl72p0KlE
-NfAnKH+7Hu/RCqoooVWqDxITda6JgLnGn6xnA+udOgaqMz8yXhmKuWtFdit7pD2v
-KuHPqaDpXifLBGiotC55Qef2zXtnEh3CMWe0n2Vpir+vaKq/i4mcWrA3LPjsy/Wk
-ODOQaUaoUAmCQxMNzWl2UUtQr0dqHLjFaIxx/4JMf6Z7R1E+0U7cMX0D7zM6WLGx
-tPMNQjTZzgCC91hDzoG72QX0MOWnPVPVaRxV8GTBHyG8t/e+MaZ2B17/fAZ2X1By
-0g4VcNNTL0tDg03yomeu/io7GRYilHzbP3W18cx+2eQ/vSyCMlrSDkSkjuOZhI2W
-nPydisidcxTaFKVLEOJmSbj1Omgf9LfkGeUDsKJdaxP7Whm+MebUavgnrgzNJ+pl
-qqn35wH8MG4TLE4Yva8BPzzzKDmIRO7jep2yGEVKbs0JPNGIKcgLUJhrZAZs4ksv
-EAuQNyicNjxSQiJ9YJF6qVIQUdRjun2b76oCYdUvSRCtjKod1cfYdkVbGnr74+vg
-dmp4zaPxuZ+a2pqH2srde/QsIHz9ETm/K5bXsNQQrtwMjKtisEw/GwcWNj6kylKe
-2oMmID1BFlgazKrjsngvnlbnSgzHf58oJmxFSX09sFwwdVjN9Cb8z39Lg9xQrBbI
-hTS9NNj9sMaaOl72zrDc
-=/sMv
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOKYIP/RSXKsd0kK9wGDNUZCMFKU4/
+Wu+2oMmzlh+Orn3BWupOdaL/mQ9bOYy40jcRJWX5a/faf/iCl41zI6LV1qr956JN
+zsV9S4n+c7Pjk3s7DESr6xTu//v9htSdrUA882b4K6be0Hsshbrn46xMLgFqraKe
+izF+nL5GFrPBrNAEE+VfL0BPCxJba7+NSay9DdUqyWAbzGaIjQ1KrNcDXODFM816
+CFbHq8y79r/jSnrklJ7EKi4asKEoqIzwQpsRGZfDTbIqWCPDG1UxCl5b64UShjFQ
+3grJyKmVlvkEbv3flSP0Cu00OqdML+hRtYHjbAaw8d8jHATfP7Qu8evI0aRi0IdD
+H2wG8V3KkVkP/KNFpI6HeD/ds0B0cyHwYUA8sV8L1ZvW7mtTe0bnf4N3hwEOPdOP
+ZFLbqx5Tx2mAyU7Mn4YuFmqB92cwcSbBsTLiN0n4B4G90WuW6SjjV//8xPxJucho
+7suK0a5dmOTRAd/BtejIK3DxiiS55NY1kBXvV1TVkQBPsa99NtJTVzsnVcJ/WCyS
++SVzIsnIKUWSY2675hVwBULdICumwAXr/qWS+qjoAyNUFaanl4wxsQw0/VY3y3kR
+pfnJWNhpQ4RjsCaN0nPIYEshkbhiJQVtzONNCS68ESSC0Ry9hkrYu5ER/LKyPlHk
+a9txfRzFyLOZZcgaA1kH
+=fwmG
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/files/llvm-3.5-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.5-gentoo-install.patch
new file mode 100644
index 000000000000..7a8c9f7dfc1c
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-3.5-gentoo-install.patch
@@ -0,0 +1,83 @@
+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-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 10ef3a12a0a0..8e3a0b3bee56 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.67 2013/12/20 10:53:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.68 2013/12/20 13:18:30 mgorny Exp $
 
 EAPI=5
 
@@ -152,7 +152,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
-	epatch "${FILESDIR}"/${PN}-3.4-gentoo-install.patch
+	epatch "${FILESDIR}"/${PN}-3.5-gentoo-install.patch
 	use clang && epatch "${FILESDIR}"/clang-3.5-gentoo-install.patch
 
 	local sub_files=(