diff options
author | 2017-10-19 15:29:15 +0900 | |
---|---|---|
committer | 2017-10-19 15:54:20 +0900 | |
commit | 7f8606330a9379e0372495cbe38390b284535b34 (patch) | |
tree | 209a7039595358e8b10d1d0fe0ded66a863f90f9 | |
parent | python, portage, glibc: merged into gentoo main repo. (diff) | |
download | android-7f8606330a9379e0372495cbe38390b284535b34.tar.gz android-7f8606330a9379e0372495cbe38390b284535b34.tar.bz2 android-7f8606330a9379e0372495cbe38390b284535b34.zip |
clean up outdated ebuilds to accommodate EAPI updates.
no modification:
nbench
not needed:
qtwebkit
jags
posixovl
unionfs-fuse
linux-headers
runit
merged to gentoo or prefix overlay:
llvm
bootstrap-rap.sh
outdated:
wxwidgets.eclass
inputproto
virtualgl
Closes: https://bugs.gentoo.org/634098
Closes: https://bugs.gentoo.org/634120
136 files changed, 0 insertions, 9090 deletions
diff --git a/app-benchmarks/nbench/ChangeLog b/app-benchmarks/nbench/ChangeLog deleted file mode 100644 index 0c12dc0..0000000 --- a/app-benchmarks/nbench/ChangeLog +++ /dev/null @@ -1,140 +0,0 @@ -# ChangeLog for app-benchmarks/nbench -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/nbench/ChangeLog,v 1.33 2010/09/30 21:23:29 ranger Exp $ - - 30 Sep 2010; Brent Baude <ranger@gentoo.org> nbench-2.2.3-r1.ebuild: - stable ppc64, bug 331147 - - 18 Sep 2010; Raúl Porcel <armin76@gentoo.org> nbench-2.2.3-r1.ebuild: - alpha/arm/sh/sparc stable wrt #331147 - - 16 Sep 2010; Raúl Porcel <armin76@gentoo.org> nbench-2.2.3.ebuild, - nbench-2.2.3-r1.ebuild: - Add ~arm - - 06 Aug 2010; Christian Faulhammer <fauli@gentoo.org> - nbench-2.2.3-r1.ebuild: - stable x86, bug 331147 - - 05 Aug 2010; Jeroen Roovers <jer@gentoo.org> nbench-2.2.3-r1.ebuild: - Stable for PPC (bug #331147). - - 05 Aug 2010; Jeroen Roovers <jer@gentoo.org> nbench-2.2.3-r1.ebuild: - Stable for HPPA (bug #331147). - - 04 Aug 2010; Markos Chandras <hwoarang@gentoo.org> nbench-2.2.3-r1.ebuild: - Stable on amd64 wrt bug #331147 - - 14 Dec 2009; Jeroen Roovers <jer@gentoo.org> nbench-2.2.3-r1.ebuild: - Space. - - 14 Dec 2009; Jeroen Roovers <jer@gentoo.org> nbench-2.2.3-r1.ebuild: - Remove testing cruft. - -*nbench-2.2.3-r1 (14 Dec 2009) - - 14 Dec 2009; Jeroen Roovers <jer@gentoo.org> +nbench-2.2.3-r1.ebuild, - files/nbench-2.2.3-Makefile.patch: - Bump to hopefully fix missing pointer.h (bug #296860). - - 01 Apr 2009; Jeroen Roovers <jer@gentoo.org> -nbench-2.2.2.ebuild, - nbench-2.2.3.ebuild: - Remove old. Remove silly DEPEND. - - 01 Dec 2008; Brent Baude <ranger@gentoo.org> nbench-2.2.3.ebuild: - stable ppc64, bug 249105 - - 30 Nov 2008; Markus Meier <maekke@gentoo.org> nbench-2.2.3.ebuild: - amd64 stable, bug #249105 - - 29 Nov 2008; Raúl Porcel <armin76@gentoo.org> nbench-2.2.3.ebuild: - alpha/sparc/x86 stable wrt #249105 - - 29 Nov 2008; Tobias Scherbaum <dertobi123@gentoo.org> nbench-2.2.3.ebuild: - ppc stable, bug #249105 - - 28 Nov 2008; Jeroen Roovers <jer@gentoo.org> nbench-2.2.3.ebuild: - Stable for HPPA (bug #249105). - - 29 Oct 2008; Jeroen Roovers <jer@gentoo.org> -nbench-2.2.1.ebuild: - Remove old. - -*nbench-2.2.3 (29 Oct 2008) - - 29 Oct 2008; Jeroen Roovers <jer@gentoo.org> - +files/nbench-2.2.3-Makefile.patch, metadata.xml, +nbench-2.2.3.ebuild: - Pick up maintainership. Version bump. Patch Makefile to use toolchain CC - (bug #243520). - - 21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog: - Transition to Manifest2. - - 06 Dec 2006; Alexander H. Færøy <eroyf@gentoo.org> nbench-2.2.2.ebuild: - Stable on MIPS. - - 08 Jul 2006; Markus Rothe <corsair@gentoo.org> nbench-2.2.2.ebuild: - Stable on ppc64 - - 15 Jun 2006; Brent Baude <ranger@gentoo.org> nbench-2.2.2.ebuild: - keywording nbench-2.2.2 ~ppc64 per solar's request; looks fine to me too - - 09 Sep 2005; Aron Griffis <agriffis@gentoo.org> nbench-2.2.2.ebuild: - Mark 2.2.2 stable on alpha - - 31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org> nbench-2.2.2.ebuild: - ppc stable - - 20 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> nbench-2.2.2.ebuild: - Stable on sparc - - 19 Jul 2005; MATSUU Takuto <matsuu@gentoo.org> nbench-2.2.2.ebuild: - Stable on x86, amd64 and sh. - - 29 Mar 2005; Guy Martin <gmsoft@gentoo.org> nbench-2.2.2.ebuild: - Stable on hppa. - - 13 Mar 2005; Tavis Ormandy <taviso@gentoo.org> nbench-2.2.2.ebuild: - add ~alpha keyword - -*nbench-2.2.2 (30 Dec 2004) - - 30 Dec 2004; MATSUU Takuto <matsuu@gentoo.org> +nbench-2.2.2.ebuild: - Version bumped. - - 18 Nov 2004; Daniel Goller <morfic@gentoo.org> nbench-2.2.1.ebuild: - Added support for LDFLAGS - -*nbench-2.2.1 (07 Nov 2004) - - 07 Nov 2004; Daniel Goller <morfic@gentoo.org> +metadata.xml, - +nbench-2.2.1.ebuild: - Moved from sys-apps/nbench to app-benchmarks/nbench. - - 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> - nbench-2.2.1.ebuild: - Masked nbench-2.2.1.ebuild stable for ppc - - 30 Jun 2004; Aron Griffis <agriffis@gentoo.org> nbench-2.2.1.ebuild: - glibc -> libc - -*nbench-2.2.1 (15 Mar 2004) - - 15 Mar 2004; <matsuu@gentoo.org> nbench-2.2.1.ebuild: - Version bumped. Bugs #23209. - Removed dosed in src_compile. Bugs #44712. - - 24 Feb 2004; Lars Weiler <pylon@gentoo.org> nbench-2.1.ebuild: - Works on ppc. Masking ~ppc - - 24 Feb 2004; Sven Blumenstein <bazik@gentoo.org> nbench-2.1.ebuild: - Stable on sparc. - - 18 Jan 2004; <tuxus@gentoo.org> nbench-2.1.ebuild: - Added ~mips to KEYWORDS. - - 17 Oct 2003; Sven Blumenstein <bazik@gentoo.org> nbench-2.1.ebuild: - Added ~sparc keyword. - -*nbench-2.1 (30 Jan 2003) - 30 Jan 2003l Joshua Brindle <method@gentoo.org> nbench-2.1.ebuild : - Initial import. Ebuild submitted by MATSUU Takuto <matsuu@7501.net>. diff --git a/app-benchmarks/nbench/Manifest b/app-benchmarks/nbench/Manifest deleted file mode 100644 index b85e14c..0000000 --- a/app-benchmarks/nbench/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX nbench-2.2.3-Makefile.patch 709 RMD160 068235291ba5af4f62f6417d574b4a9425731426 SHA1 abf395562b601cd4a023d285f14952cfade51a08 SHA256 b58a2e2213efa31d2a8683e315afb7d330830eaf73024c036092918e209d65de -DIST nbench-byte-2.2.3.tar.gz 111791 RMD160 a07d2a9f1a6162a5071602e89e6360c13521e463 SHA1 f2a03c56dc2bf26e478c2a1828debcafd83983ef SHA256 723dd073f80e9969639eb577d2af4b540fc29716b6eafdac488d8f5aed9101ac -EBUILD nbench-2.2.3-r1.ebuild 1095 RMD160 c292c2d578279b50b6966d56975579691c92c448 SHA1 3edd385899eb1c26578a0de9ab3ff74f4c794eaa SHA256 054c5188cf532625b1415963b12d37cf4e822c3b12ad0b8371691c20afdb2441 -MISC ChangeLog 4587 RMD160 988ccf4e071e7f6f6fd0b8db5baa6bfc87071601 SHA1 47ea1eb0afe8d5439667d28aa6a80c8e069cc7fd SHA256 aa0030c042e38f79b42faf9b327a813c697f43ce29db2ba3ddeaff1a533f9971 -MISC metadata.xml 252 RMD160 ed7e3d6637ec96975f17ce5c33628aa482dfd663 SHA1 ddd00321e20f4a53a140eeb56cb01b9fab24d657 SHA256 76fd24f00e95b2892ca60acdce02d8c85dfeff84fc89ca14ffdbc00b82de44b3 diff --git a/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch b/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch deleted file mode 100644 index c41fd07..0000000 --- a/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile.org 2004-12-30 03:23:30.000000000 +0100 -+++ Makefile 2009-12-14 13:31:18.000000000 +0100 -@@ -19,10 +19,10 @@ - # You should leave -static in the CFLAGS so that your sysinfo can be - # compiled into the executable. - --CC = gcc -+#CC = gcc - - # generic options for gcc --CFLAGS = -s -static -Wall -O3 -+#CFLAGS = -s -static -Wall -O3 - - # if your gcc lets you do it, then try this one - #CFLAGS = -s -static -Wall -O3 -fomit-frame-pointer -funroll-loops -@@ -126,7 +126,7 @@ - if [ "4" = `./pointer` ] ; then touch pointer.h ;\ - else echo "#define LONG64" >pointer.h ; fi - --misc.o: misc.h misc.c Makefile -+misc.o: misc.h misc.c pointer.h Makefile - $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ - -c misc.c - diff --git a/app-benchmarks/nbench/metadata.xml b/app-benchmarks/nbench/metadata.xml deleted file mode 100644 index 6b29bc5..0000000 --- a/app-benchmarks/nbench/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>no-herd</herd> - <maintainer> - <email>jer@gentoo.org</email> - <name>Jeroen Roovers</name> - </maintainer> -</pkgmetadata> diff --git a/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild b/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild deleted file mode 100644 index d0c487a..0000000 --- a/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild,v 1.10 2010/09/30 21:23:29 ranger Exp $ - -EAPI="2" - -inherit eutils toolchain-funcs - -MY_P="${PN}-byte-${PV}" -DESCRIPTION="Linux/Unix of release 2 of BYTE Magazine's BYTEmark benchmark" -HOMEPAGE="http://www.tux.org/~mayer/linux/bmark.html" -SRC_URI="http://www.tux.org/~mayer/linux/${MY_P}.tar.gz" - -LICENSE="freedist" -SLOT="0" -KEYWORDS="~x86-linux" -IUSE="" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}/${P}-Makefile.patch" - sed \ - -e 's:$compiler -v\( 2>&1 | sed -e "/version/!d"\|\):$compiler -dumpversion:' \ - -i sysinfo.sh || die "patching sysinfo.sh failed" - sed -e 's:inpath="NNET.DAT":inpath="/usr/share/nbench/NNET.DAT":' \ - -i nbench1.h || die "patching nbench1.h failed" -} - -src_compile() { - emake LINKFLAGS="${LDFLAGS}" CC=$(tc-getCC) CFLAGS="${CFLAGS}" || die "make failed" -} - -src_install() { - dobin nbench - insinto /usr/share/nbench - doins NNET.DAT - dodoc Changes README* bdoc.txt -} diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest deleted file mode 100644 index 9be302e..0000000 --- a/dev-qt/qtwebkit/Manifest +++ /dev/null @@ -1,18 +0,0 @@ -AUX 4.10.4-gcc5.patch 1599 SHA256 f5a998dcf3b21ef15b281d86cd7245e4d0ceb885f0e18c0fb7b367f81d1c8a6f SHA512 76cdccc1f1cd07ae226599b5f0e03b4e3f347d11aa1bc025a0c2ac4d30842852666393dcf3a5302156fb6adee874d87e8f89d3a63a72cde3a7dff2328201a974 WHIRLPOOL 10df94f2e1d9bb322b8f605631aa577ca45c5b72b056e258211d5cc94a9b007f790044d9d04032e7fedf22c47e2db5b7365343ba3832cccca63208984a45cb34 -AUX 4.10.4-use-correct-icu-typedef.patch 1262 SHA256 356a316ef34902e1738803d6ad6e2c6f9265bca7dd67fd41d3912436e96c459e SHA512 73915919247a09796c5923f1524b1a003f196a9bcd8b19ef47e10196c59febcf4792cb3da02c93f881773a1b0d6bb041dd4c2dffc894dec9fb3a641032919558 WHIRLPOOL 34305ddc7734379aaf87dfeb6c666e222d15ba3b7feca7f421d65ed2677e66be8e7551d2bc9e1369fa7f97404528bf7d2a9438f6cfb8d318b9661d71fcb58b78 -AUX 4.8.2-javascriptcore-x32.patch 500 SHA256 16c68e343f4bb416b870ae46bcaf80e6c2bc7ab45f5dc66f10698e8a5baefa90 SHA512 4fa7e280de9364e9eb8df651075aa0a2dded58db0db44d008bad3f053146f539c82c9aa1312006cc85b8367850ec385d3e3f716d2d4b8f4f1d15cd4756957632 WHIRLPOOL bc3241264a78353b0235a7caeb099d49a5fe93677f7fe88316a24c14b35a7f3a0c19b834b3b78a3fcd14d8b265ff5021153147a40f6332b680ad2f70095afe80 -AUX qtwebkit-5.2.1-disable-gstreamer.patch 766 SHA256 06b0aa301aadc5fb601beb67583dfe416bf840a1266ccef794981a7610218508 SHA512 cfe59ff3307769ddee1dc0de00097349f6392f605d3ebd2ed1e41e450685d9ce6fa99323d20331a4a25af6cb40cb49d12ee5a5883f5d5219316ac3068aa76353 WHIRLPOOL 71062b0c17dd2bde216a01517d1a890958359cdcd9a355f9f7d9b9c8f670ffad74284c4a07346197527d893802d94ef65a1d0e98fb98b4560306449f8d26bf71 -AUX qtwebkit-5.3.2-use-gstreamer010.patch 926 SHA256 444964b7af1ace629efb160efb434ca15e44ccd2c44ed8643019449b42268d3d SHA512 bc88474a7b3c8b4f86748e6913a302a5d7cc0b7837233aeb27904ccbcb8e25adef6f6e4ee039b0b161eda43c6504bb7cbf053d272884e9ab869279e962942dac WHIRLPOOL d3fc6a3dd0504cd9efb738fc39780a47b0d3c4875c54cb0c585a2b7f76da9083b3856ae5b74f0f3e4290471ff19e99bc24c1d6932aee7bf38a96636b12c68274 -AUX qtwebkit-5.4.2-system-leveldb.patch 703 SHA256 e0c5a2eda2b75e8c426752cf49dca55a89301edbcc2ce29d2e1f09690889e959 SHA512 c617d5e98fb2f2b2fa47a56af2b2daf1d37eec31054e69d36aa7fac00cc1a51dacaea3c4836564b63a9b881f843d543c74eeab3e9c272f90a8cd1330db3a0bf6 WHIRLPOOL 4c904c4506332eed4ee94c3c848be4751930ed1d33937afc913717cd4c568f170439cbc3e188a38034a603b76a72e533e657d92dbbe3a71a9bc75b6f8f9001d7 -AUX qtwebkit-5.5.1-disable-jit.patch 460 SHA256 d4f64d992bdfde58d87bfb3fe131200bda55324ddbc9a7204d26f9df6dc14ec4 SHA512 d9af937475bed746a0e47698b432370488b644a5aeeb008eaa201f4d264fe9f52525345b47757eec08b2adc8dc46d15a044e6ff5e49420f897f1bb416ca06749 WHIRLPOOL 5515613b1fddd09a5b05200dea5b843d875b4bd1e9e42d139fba77e47db15ab7967e2d9c21cc0194dac2f63d01d91d10c5ec48f4201801e2e41eed65f11cd7ec -DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84 -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2 -DIST qtwebkit-2.3.4.tar.gz 51648808 SHA256 c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca SHA512 f7aa3762f84b8ef6c75ceb40beaad750b5c09bb3f14964cda17b42f489ff2c876e35678b57404057e909948160450a144de67ad1337a42992dc5a1d4b796bec4 WHIRLPOOL 1d8e78a8d7f920b132ed79dbc6a6a71b784080d8aa4b9123f22797efa6062eb4f85236ab66f3232900a131049d7c78fc5fc333511b161dc72c30434cd7fef542 -DIST qtwebkit-opensource-src-5.4.2.tar.xz 33460988 SHA256 3e4243e14001f47b8842f72287728b731f8b62b480bd72a1b0e2a9cfe25dce6d SHA512 edb0a8ad63f70d85324af08f46070cc386fd27ff858f590a592f71583cddade897b305527ec3bb8d7a4d491c9d141af04d783ea101e6c40f683df16297652ff3 WHIRLPOOL 49490e7633e8e95abf4d3f0f17b173e40b7df0ce658d56f87dfd4bc73ab9700823e7ea7d5e9c61edb5a06552df5ead701b059d14a8074afa4bad22f77b622fea -DIST qtwebkit-opensource-src-5.5.1.tar.xz 33489924 SHA256 77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69 SHA512 a44ca088fee7dbf0b10df7e1f6c914f37b31cf7c3b95156c32e5b8373a8de54013cd51cdf5b18b72f165d60c21ce55bceca86b038de68b1eb78ae0cd4bb8228a WHIRLPOOL a54eabaf72fdd4ffba4317b0c64b57da239605f0d1c8020be4282c0ce802727fd9321c4da14f9cb977419bedc97a4ac44cbc34e7003ff80ae31cfd983a577dc9 -EBUILD qtwebkit-4.10.4.ebuild 3600 SHA256 aabf382813e02775b2764a93c5980b399f90ad4e1e6681fcec4bba5d047bbc64 SHA512 051caffee291b48ff5d13689a30992763852754b7de1b77343024bef9e60da7997a2b0d6d9a969e86e3c5ec1b4282ff2c0e0d957898a6ea0f5fe28682c3792f9 WHIRLPOOL a76e93173c41a7038926fb318f9b28d9f6baca1a80171b9ecbe60e09125a464bb93d7d48386a5264f723f614266f728d612fafb869172a1fa5b48c3e5bc73417 -EBUILD qtwebkit-4.8.6-r1.ebuild 2192 SHA256 0382e9c71181294d63accb41888862a5552cd983310a69b94980411bdd942a66 SHA512 1898f3434485a4f73b757f9cea902edc9ae5d03bb5a23e30f3601f0194adae6606c675e857cebe62f64f0cc913f014209ec9d5e83a5cf8ab62a486aba8831f56 WHIRLPOOL f1085999dc3ce2d0c1a719291ed11aacde1ad1d36969ca057e0828e42456433a6a23399db611c29480e697460a283fb15c8b5c82898f18acd64ef955c0ea55d8 -EBUILD qtwebkit-4.8.7.ebuild 2164 SHA256 37c37f9e03370f2026fa9020ea7cc84a044d5b2a78799b6eb0875a81759c3f12 SHA512 cf50323ea360002b49971411d4a5aa640eafc7396ad38469bb1291d5b292b3af4968a222641cdef241c819497b4d6ad3a6f083c1d958537066c97aa55627a357 WHIRLPOOL d6c805d2cb973708a25ef98eaadee4ff619ad25eac60d619dfe74a151fdc68d454d1a338183d6bc4eacd274ee2cfbc78d06d0adb281cf4f0e6d9b4aa1d781578 -EBUILD qtwebkit-5.4.2.ebuild 2911 SHA256 687320874749d58ecfd8da686d7a4f8c08b6fc5481c12659ba8e943de617fe90 SHA512 a41685e954d90b90feeecffdb17620b6c8cb824a08f39eb14575b6fa0e2b88854ded898b99026b249f16a798a5358b398623e50fccfcfd9ecb221e1cd2823cff WHIRLPOOL 1b3bd82d32002994dd208fef326fcafee2cac7a424436c87fb8a085867247b68a7869ee406dcbbe5b00c361d78a6d5ffae8b1628f58e769d04f182dd57cafa94 -EBUILD qtwebkit-5.5.1-r1.ebuild 3114 SHA256 e871de2a4ffb6fc98c4693adb4d93c0d3ccd41b5a87f8df0ecf1e052e0242fda SHA512 a74dfda32969119497128b90f492d0dd4402f8f1434b6aec6394bf26c1ad6d2fb3be6c3e2bc4fefbd66878d16ce8f317cbfebe62abb7821104c82f93eaa4bfeb WHIRLPOOL b752a6d6939c40c6deb22d8279d4167e911a385f242e774399d9a3e18fe056b78a65c6b194d294291b2953a9fd9dd44d2db657c5af74c62e232c7457636e860c -MISC metadata.xml 1313 SHA256 0605f518e0777628f9976865a7c937bd0206954f2da0725e569608ea18d17e93 SHA512 ef2dce2348d143978b87e262da505adb5f3d09e13800c0ba8602b7ee8453ccd39ac77ac9795731367fd4dbce80f2c12a3eb0e4796321665ba6d9d176500a181c WHIRLPOOL 126a21713c1a2d449a1fc710b9cf23b220d3c55b3ece950b0c71cb4a8230f7436cff86a5ef93135673e96d32281e47178106f552b7de250253f05daedfb2ff82 diff --git a/dev-qt/qtwebkit/files/4.10.4-gcc5.patch b/dev-qt/qtwebkit/files/4.10.4-gcc5.patch deleted file mode 100644 index 3a6b2a3..0000000 --- a/dev-qt/qtwebkit/files/4.10.4-gcc5.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> -Date: Fri, 6 Mar 2015 10:20:13 +0000 (+0100) -Subject: Fix g++ 5.0 build -X-Git-Tag: v5.4.2~12 -X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtwebkit.git;a=commitdiff_plain;h=650c6ee8e76bb574d3a1bea09e2494992d8f070e;hp=f9966f351678351ee6b971d7b6b25a4987407e46 - -Fix g++ 5.0 build - -A non-inline template needs to be explicitly instantiated if used -outside the object where it is declared. - -Patch suggested by Khem Raj. - -Task-number: QTBUG-44829 -Change-Id: Ib0adbd9273bd1cef01e5863bc8aaa9c373022792 -Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> ---- - -diff --git a/Source/JavaScriptCore/runtime/JSObject.cpp b/Source/JavaScriptCore/runtime/JSObject.cpp -index 5637e20..bd55919 100644 ---- a/Source/JavaScriptCore/runtime/JSObject.cpp -+++ b/Source/JavaScriptCore/runtime/JSObject.cpp -@@ -1909,6 +1909,11 @@ void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, un - } - } - -+// Used in JSArray.cpp so we must instantiate explicit -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value); -+ - void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage) - { - VM& vm = exec->vm(); - diff --git a/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch b/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch deleted file mode 100644 index 3e48162..0000000 --- a/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 916f00008b602ae1b260106e7fb1274d2282f61f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@flaska.net> -Date: Tue, 3 Sep 2013 16:59:35 +0200 -Subject: [PATCH] ICU has defined UChar32 to be an int32_t since 2002 - -This fixes the build failure of qtwebkit23 on my Gentoo machine. ---- - Source/WTF/wtf/unicode/qt4/UnicodeQt4.h | 2 +- - Source/WTF/wtf/unicode/wchar/UnicodeWchar.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h -index a2d1ad4..392d2db 100644 ---- a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h -+++ b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h -@@ -69,7 +69,7 @@ typedef uint16_t UChar; - #endif - - #if !USE(ICU_UNICODE) --typedef uint32_t UChar32; -+typedef int32_t UChar32; - #endif - - namespace WTF { -diff --git a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h -index 10c2026..db8944e 100644 ---- a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h -+++ b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h -@@ -31,7 +31,7 @@ - #include <wtf/unicode/UnicodeMacrosFromICU.h> - - typedef wchar_t UChar; --typedef uint32_t UChar32; -+typedef int32_t UChar32; - - namespace WTF { - namespace Unicode { --- -1.7.1 - diff --git a/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch b/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch deleted file mode 100644 index 16f52d9..0000000 --- a/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig 2012-07-17 15:06:26.692276108 +0000 -+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h 2012-07-17 15:06:54.480928701 +0000 -@@ -993,7 +993,7 @@ - #endif - - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) --#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \ -+#if (CPU(X86_64) && defined(__LP64__) && (OS(UNIX) || OS(WINDOWS))) \ - || (CPU(IA64) && !CPU(IA64_32)) \ - || CPU(ALPHA) \ - || CPU(SPARC64) \ diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch deleted file mode 100644 index 05e41a1..0000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:35:47.795676444 +0000 -+++ Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:36:38.602433220 +0000 -@@ -99,12 +99,6 @@ - - # HTML5 Media Support for builds with GStreamer - unix:!mac:!contains(QT_CONFIG, no-pkg-config) { -- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { -- WEBKIT_CONFIG += video use_gstreamer -- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { -- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 -- } -- use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video - } - - !enable?(video):qtHaveModule(multimediawidgets) { diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch deleted file mode 100644 index 1c02e45..0000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:09:50.010617142 +0100 -+++ Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:17:10.741678989 +0100 -@@ -96,14 +96,8 @@ - use?(3d_graphics): WEBKIT_CONFIG += webgl - - # HTML5 Media Support for builds with GStreamer -- unix:!mac:!contains(QT_CONFIG, no-pkg-config) { -- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { -- WEBKIT_CONFIG += video use_gstreamer -- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { -- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 -- } -+ WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 - use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video -- } - - !enable?(video):qtHaveModule(multimediawidgets) { - WEBKIT_CONFIG += video use_qt_multimedia diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch deleted file mode 100644 index 0a476c6..0000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch +++ /dev/null @@ -1,25 +0,0 @@ -Correct header location so system dev-libs/leveldb can be detected. - ---- Tools/qmake/config.tests/leveldb/leveldb.cpp -+++ Tools/qmake/config.tests/leveldb/leveldb.cpp -@@ -19,7 +19,7 @@ - - #include <leveldb/db.h> - #include <leveldb/env.h> --#include <helpers/memenv/memenv.h> -+#include <leveldb/helpers/memenv.h> - - int main(int, char**) - { - ---- Source/WebCore/platform/leveldb/LevelDBDatabase.cpp -+++ Source/WebCore/platform/leveldb/LevelDBDatabase.cpp -@@ -38,7 +38,7 @@ - #include <leveldb/comparator.h> - #include <leveldb/db.h> - #include <leveldb/env.h> --#include <helpers/memenv/memenv.h> -+#include <leveldb/helpers/memenv.h> - #include <leveldb/slice.h> - #include <string> - #include <wtf/PassOwnPtr.h> diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch deleted file mode 100644 index 40e58f0..0000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch +++ /dev/null @@ -1,15 +0,0 @@ -Allow disabling JIT for hardened. - -Author: Magnus Granberg <zorry@gentoo.org> -Gentoo-bug: 562396 - ---- a/Tools/qmake/mkspecs/features/features.pri -+++ b/Tools/qmake/mkspecs/features/features.pri -@@ -70,6 +70,7 @@ FEATURE_DEFAULTS = \ - ENABLE_INPUT_TYPE_WEEK=0 \ - ENABLE_INSPECTOR=1 \ - ENABLE_INSPECTOR_SERVER=1 \ -+ ENABLE_JIT=0 \ - ENABLE_JAVASCRIPT_DEBUGGER=1 \ - ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \ - ENABLE_LEGACY_NOTIFICATIONS=1 \ diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml deleted file mode 100644 index 68b6e35..0000000 --- a/dev-qt/qtwebkit/metadata.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - <flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag> - <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:1.0</pkg></flag> - <flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:0.10</pkg></flag> - <flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag> - <flag name="orientation">Enable device orientation detection via <pkg>dev-qt/qtsensors</pkg></flag> - <flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag> - <flag name="qml">Build QML/QtQuick bindings</flag> - <flag name="webchannel">Enable integration with <pkg>dev-qt/qtwebchannel</pkg></flag> - <flag name="webp">Add support for WebP image format</flag> - </use> - <upstream> - <bugs-to>https://bugreports.qt.io/</bugs-to> - <doc>http://doc.qt.io/</doc> - </upstream> -</pkgmetadata> diff --git a/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild b/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild deleted file mode 100644 index dc656a5..0000000 --- a/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit eutils multilib python-any-r1 qmake-utils toolchain-funcs multilib-minimal - -MY_PV=${PV/4.10/2.3} - -DESCRIPTION="The WebKit module for the Qt toolkit" -HOMEPAGE="https://www.qt.io/ http://trac.webkit.org/wiki/QtWebKit" -SRC_URI="mirror://kde/stable/${PN}-2.3/${MY_PV}/src/${PN}-${MY_PV}.tar.gz" - -LICENSE="|| ( LGPL-2.1 GPL-3 )" -SLOT="4" -KEYWORDS="~amd64" -IUSE="debug +gstreamer" - -RDEPEND=" - >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] - dev-libs/libxml2:2[${MULTILIB_USEDEP}] - dev-libs/libxslt[${MULTILIB_USEDEP}] - >=dev-qt/qtcore-4.8.6-r1:4[ssl,${MULTILIB_USEDEP}] - >=dev-qt/qtdeclarative-4.8.6-r1:4[${MULTILIB_USEDEP}] - >=dev-qt/qtgui-4.8.6-r1:4[${MULTILIB_USEDEP}] - >=dev-qt/qtopengl-4.8.6-r1:4[${MULTILIB_USEDEP}] - >=dev-qt/qtscript-4.8.6-r1:4[${MULTILIB_USEDEP}] - >=dev-qt/qtsql-4.8.6-r1:4[sqlite,${MULTILIB_USEDEP}] - >=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - virtual/jpeg:0[${MULTILIB_USEDEP}] - virtual/libudev:=[${MULTILIB_USEDEP}] - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - gstreamer? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-lang/perl - dev-lang/ruby - dev-util/gperf - sys-devel/bison - sys-devel/flex - virtual/perl-Digest-MD5 - virtual/perl-File-Spec - virtual/perl-Getopt-Long - virtual/pkgconfig[${MULTILIB_USEDEP}] -" - -S=${WORKDIR} - -PATCHES=( - "${FILESDIR}/${PV}-gcc5.patch" - "${FILESDIR}/${PV}-use-correct-icu-typedef.patch" -) - -src_prepare() { - # examples cause a sandbox violation (bug 458222) - sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die - - # respect CXXFLAGS - sed -i -e '/QMAKE_CXXFLAGS_RELEASE.*=/d' \ - Source/WTF/WTF.pro \ - Source/JavaScriptCore/Target.pri || die - - # fix perl shebang - sed -i -r -e "1s,/usr,${EPREFIX}/usr," \ - Tools/Scripts/build-webkit || die - - # apply patches - [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" - epatch_user -} - -multilib_src_compile() { - local -x \ - QTDIR=${EPREFIX}/usr/$(get_libdir)/qt4 \ - WEBKITOUTPUTDIR=${BUILD_DIR} - - local myconf=( - "${S}"/Tools/Scripts/build-webkit - --qt - # tell the build system where to find the qmake binary for the current ABI - --qmake="$(qt4_get_bindir)"/qmake - --qmakearg="CONFIG+=nostrip DEFINES+=HAVE_QTTESTLIB=0" - --makeargs="${MAKEOPTS}" - --$(usex debug debug release) - --$(usex gstreamer video no-video) - # disable WebKit2 since it requires Qt5 - --no-webkit2 - # prevent automagic dependency on qt-mobility (bug 547350) - --no-geolocation - --no-device-orientation - --no-orientation-events - # copied from eqmake4 - QMAKE_AR="'$(tc-getAR) cqs'" - QMAKE_CC="'$(tc-getCC)'" - QMAKE_CXX="'$(tc-getCXX)'" - QMAKE_LINK="'$(tc-getCXX)'" - QMAKE_LINK_C="'$(tc-getCC)'" - QMAKE_OBJCOPY="'$(tc-getOBJCOPY)'" - QMAKE_RANLIB= - QMAKE_STRIP= - QMAKE_CFLAGS="'${CFLAGS}'" - QMAKE_CFLAGS_RELEASE= - QMAKE_CFLAGS_DEBUG= - QMAKE_CXXFLAGS="'${CXXFLAGS}'" - QMAKE_CXXFLAGS_RELEASE= - QMAKE_CXXFLAGS_DEBUG= - QMAKE_LFLAGS="'${LDFLAGS}'" - QMAKE_LFLAGS_RELEASE= - QMAKE_LFLAGS_DEBUG= - ) - echo "${myconf[@]}" - "${myconf[@]}" || die -} - -multilib_src_install() { - emake INSTALL_ROOT="${D}" install -C $(usex debug Debug Release) - - # move pkgconfig file to the correct location - mv "${ED}"/usr/$(get_libdir){/qt4/pkgconfig,} || die -} diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild deleted file mode 100644 index 47f09d1..0000000 --- a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit qt4-build-multilib - -DESCRIPTION="The WebKit module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="arm ia64 ppc ppc64" -else - KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+gstreamer icu +jit" - -# libxml2[!icu?] is needed for bugs 407315 and 411091 -DEPEND=" - >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] - ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] - gstreamer? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}] - >=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-base-0.10.36-r1:0.10[${MULTILIB_USEDEP}] - ) - icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/4.8.2-javascriptcore-x32.patch" -) - -QT4_TARGET_DIRECTORIES=" - src/3rdparty/webkit/Source/JavaScriptCore - src/3rdparty/webkit/Source/WebCore - src/3rdparty/webkit/Source/WebKit/qt" - -QCONFIG_ADD="webkit" -QCONFIG_DEFINE="QT_WEBKIT" - -src_prepare() { - # Remove -Werror from CXXFLAGS - sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \ - src/3rdparty/webkit/Source/WebKit.pri || die - - # Fix version number in generated pkgconfig file (bug 406443) - sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \ - src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die - - # Prevent automagic dependency on qt-mobility (bug 547350) - sed -i -e 's/contains(MOBILITY_CONFIG,\s*\w\+)/false/' \ - src/3rdparty/webkit/Source/WebCore/features.pri || die - - if use icu; then - sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \ - src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die - fi - - qt4-build-multilib_src_prepare -} - -multilib_src_configure() { - local myconf=( - -webkit - -system-sqlite - $(qt_use icu) - $(qt_use jit javascript-jit) - $(use gstreamer || echo -DENABLE_VIDEO=0) - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild deleted file mode 100644 index 53a6f56..0000000 --- a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The WebKit module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+gstreamer icu +jit" - -# libxml2[!icu?] is needed for bugs 407315 and 411091 -DEPEND=" - >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] - ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] - gstreamer? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}] - >=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-base-0.10.36-r1:0.10[${MULTILIB_USEDEP}] - ) - icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/4.8.2-javascriptcore-x32.patch" -) - -QT4_TARGET_DIRECTORIES=" - src/3rdparty/webkit/Source/JavaScriptCore - src/3rdparty/webkit/Source/WebCore - src/3rdparty/webkit/Source/WebKit/qt" - -QCONFIG_ADD="webkit" -QCONFIG_DEFINE="QT_WEBKIT" - -src_prepare() { - # Remove -Werror from CXXFLAGS - sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \ - src/3rdparty/webkit/Source/WebKit.pri || die - - # Fix version number in generated pkgconfig file (bug 406443) - sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \ - src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die - - # Prevent automagic dependency on qt-mobility (bug 547350) - sed -i -e 's/contains(MOBILITY_CONFIG,\s*\w\+)/false/' \ - src/3rdparty/webkit/Source/WebCore/features.pri || die - - if use icu; then - sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \ - src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die - fi - - qt4-build-multilib_src_prepare -} - -multilib_src_configure() { - local myconf=( - -webkit - -system-sqlite - $(qt_use icu) - $(qt_use jit javascript-jit) - $(use gstreamer || echo -DENABLE_VIDEO=0) - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild deleted file mode 100644 index 70eab16..0000000 --- a/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 qt5-build - -DESCRIPTION="WebKit rendering library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm ~arm64 ppc64 ~x86" -fi - -# TODO: qttestlib, geolocation, orientation/sensors - -IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml udev webp" -REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )" - -RDEPEND=" - dev-db/sqlite:3 - dev-libs/icu:= - >=dev-libs/leveldb-1.18-r1 - dev-libs/libxml2:2 - dev-libs/libxslt - >=dev-qt/qtcore-${PV}:5[icu] - >=dev-qt/qtgui-${PV}:5 - >=dev-qt/qtnetwork-${PV}:5 - >=dev-qt/qtsql-${PV}:5 - >=dev-qt/qtwidgets-${PV}:5 - media-libs/fontconfig:1.0 - media-libs/libpng:0= - >=sys-libs/zlib-1.2.5 - virtual/jpeg:0 - virtual/opengl - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXrender - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - gstreamer010? ( - dev-libs/glib:2 - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 - ) - multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[widgets] ) - opengl? ( >=dev-qt/qtopengl-${PV}:5 ) - printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 ) - qml? ( >=dev-qt/qtdeclarative-${PV}:5 ) - udev? ( virtual/udev ) - webp? ( media-libs/libwebp:0= ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-lang/ruby - dev-util/gperf - sys-devel/bison - sys-devel/flex - virtual/rubygems -" - -PATCHES=( - "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch" -) - -src_prepare() { - # ensure bundled library cannot be used - rm -r Source/ThirdParty/leveldb || die - - # bug 466216 - sed -i -e '/CONFIG +=/s/rpath//' \ - Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \ - Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \ - || die - - if use gstreamer010; then - epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" - elif ! use gstreamer; then - epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" - fi - use multimedia || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \ - Tools/qmake/mkspecs/features/features.prf || die - use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ - Tools/qmake/mkspecs/features/features.prf || die - use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/d' \ - Tools/qmake/mkspecs/features/features.prf || die - use qml || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \ - Source/QtWebKit.pro || die - use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \ - Tools/qmake/mkspecs/features/features.prf || die - use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ - Tools/qmake/mkspecs/features/features.prf || die - - # bug 458222 - sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die - - qt5-build_src_prepare -} diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild deleted file mode 100644 index f54851b..0000000 --- a/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 qt5-build - -DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -fi - -# TODO: qttestlib - -IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp" -REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )" - -RDEPEND=" - dev-db/sqlite:3 - dev-libs/icu:= - >=dev-libs/leveldb-1.18-r1 - dev-libs/libxml2:2 - dev-libs/libxslt - ~dev-qt/qtcore-${PV}[icu] - ~dev-qt/qtgui-${PV} - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtsql-${PV} - ~dev-qt/qtwidgets-${PV} - media-libs/fontconfig:1.0 - media-libs/libpng:0= - >=sys-libs/zlib-1.2.5 - virtual/jpeg:0 - virtual/opengl - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXrender - geolocation? ( ~dev-qt/qtpositioning-${PV} ) - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - gstreamer010? ( - dev-libs/glib:2 - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 - ) - multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] ) - opengl? ( ~dev-qt/qtopengl-${PV} ) - orientation? ( ~dev-qt/qtsensors-${PV} ) - printsupport? ( ~dev-qt/qtprintsupport-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV} ) - webchannel? ( ~dev-qt/qtwebchannel-${PV} ) - webp? ( media-libs/libwebp:0= ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-lang/ruby - dev-util/gperf - sys-devel/bison - sys-devel/flex - virtual/rubygems -" - -PATCHES=( - "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch" -) - -src_prepare() { - # ensure bundled library cannot be used - rm -r Source/ThirdParty/leveldb || die - - # bug 466216 - sed -i -e '/CONFIG +=/s/rpath//' \ - Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \ - Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \ - || die - - qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf - qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf - qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf - qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf - qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf - qt_use_disable_mod webchannel webchannel \ - Source/WebKit2/Target.pri \ - Source/WebKit2/WebKit2.pri - - if use gstreamer010; then - epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" - elif ! use gstreamer; then - epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" - fi - - # bug 562396 - use jit || epatch "${FILESDIR}/${PN}-5.5.1-disable-jit.patch" - - use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ - Tools/qmake/mkspecs/features/features.prf || die - use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ - Tools/qmake/mkspecs/features/features.prf || die - - # bug 458222 - sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die - - qt5-build_src_prepare -} diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass deleted file mode 100644 index aa8f920..0000000 --- a/eclass/wxwidgets.eclass +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.39 2014/04/21 21:55:31 ottxor Exp $ - -# @ECLASS: wxwidgets.eclass -# @MAINTAINER: -# wxwidgets@gentoo.org -# @BLURB: Manages build configuration for wxGTK-using packages. -# @DESCRIPTION: -# This eclass gives ebuilds the ability to build against a specific wxGTK -# SLOT and profile without interfering with the system configuration. Any -# ebuild with a x11-libs/wxGTK dependency must use this eclass. -# -# There are two ways to do it: -# -# - set WX_GTK_VER before inheriting the eclass -# - set WX_GTK_VER and call need-wxwidgets from a phase function -# -# (where WX_GTK_VER is the SLOT you want) -# -# If your package has optional support for wxGTK (ie. by a USE flag) then -# you should use need-wxwidgets. This is important because some packages -# will force-enable wxGTK if they find WX_CONFIG set in the environment. -# -# @CODE -# inherit wxwidgets -# -# IUSE="X wxwidgets" -# DEPEND="wxwidgets? ( x11-libs/wxGTK:2.8[X?] )" -# -# src_configure() { -# if use wxwidgets; then -# WX_GTK_VER="2.8" -# if use X; then -# need-wxwidgets unicode -# else -# need-wxwidgets base-unicode -# fi -# fi -# econf --with-wx-config="${WX_CONFIG}" -# } -# @CODE -# -# That's about as complicated as it gets. 99% of ebuilds can get away with: -# -# @CODE -# inherit wxwidgets -# DEPEND="wxwidgets? ( x11-libs/wxGTK:2.8[X] ) -# ... -# WX_GTK_VER=2.8 need-wxwidgets unicode -# @CODE -# -# Note: unless you know your package works with wxbase (which is very -# doubtful), always depend on wxGTK[X]. - -inherit eutils multilib - -# We do this in global scope so ebuilds can get sane defaults just by -# inheriting. -if [[ -z ${WX_CONFIG} ]]; then - if [[ -n ${WX_GTK_VER} ]]; then - for wxtoolkit in mac gtk2 base; do - # newer versions don't have a seperate debug profile - for wxdebug in xxx release- debug-; do - wxconf="${wxtoolkit}-unicode-${wxdebug/xxx/}${WX_GTK_VER}" - - [[ -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf} ]] || continue - - WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf}" - WX_ECLASS_CONFIG="${WX_CONFIG}" - break - done - [[ -n ${WX_CONFIG} ]] && break - done - [[ -n ${WX_CONFIG} ]] && export WX_CONFIG WX_ECLASS_CONFIG - fi -fi - -# @FUNCTION: need-wxwidgets -# @USAGE: <profile> -# @DESCRIPTION: -# -# Available configurations are: -# -# unicode (USE="X") -# base-unicode (USE="-X") - -need-wxwidgets() { - local wxtoolkit wxdebug wxconf - - if [[ -z ${WX_GTK_VER} ]]; then - eerror "WX_GTK_VER must be set before calling $FUNCNAME." - echo - die - fi - - if [[ ${WX_GTK_VER} != 2.8 && ${WX_GTK_VER} != 2.9 && ${WX_GTK_VER} != 3.0 ]]; then - eerror "Invalid WX_GTK_VER: ${WX_GTK_VER} - must be set to a valid wxGTK SLOT." - echo - die - fi - - case $1 in - unicode|base-unicode) ;; - *) eerror "Invalid $FUNCNAME profile: $1" - echo - die - ;; - esac - - # wxbase is provided by both gtk2 and base installations - if has_version "x11-libs/wxGTK:${WX_GTK_VER}[aqua]"; then - wxtoolkit="mac" - elif has_version "x11-libs/wxGTK:${WX_GTK_VER}[X]"; then - wxtoolkit="gtk2" - else - wxtoolkit="base" - fi - - # 2.8 has a separate debug element - if [[ ${WX_GTK_VER} == 2.8 ]]; then - if has_version "x11-libs/wxGTK:${WX_GTK_VER}[debug]"; then - wxdebug="debug-" - else - wxdebug="release-" - fi - fi - - wxconf="${wxtoolkit}-unicode-${wxdebug}${WX_GTK_VER}" - - if [[ ! -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf} ]]; then - echo - eerror "Failed to find configuration ${wxconf}" - echo - die - fi - - export WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf}" - export WX_ECLASS_CONFIG="${WX_CONFIG}" - - echo - einfo "Requested wxWidgets: ${1} ${WX_GTK_VER}" - einfo "Using wxWidgets: ${wxconf}" - echo -} diff --git a/sci-mathematics/jags/ChangeLog b/sci-mathematics/jags/ChangeLog deleted file mode 100644 index 2a40dc5..0000000 --- a/sci-mathematics/jags/ChangeLog +++ /dev/null @@ -1,15 +0,0 @@ -# ChangeLog for sci-mathematics/jags -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/jags/ChangeLog,v 1.1 2011/02/12 11:50:38 tomka Exp $ - - 12 Feb 2011; Thomas Kahle <tomka@gentoo.org> +jags-2.2.0.ebuild, - +metadata.xml: - Imported from science overlay, fixes bug 317741. - -*jags-2.2.0 (04 Dec 2010) - - 04 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> +jags-2.2.0.ebuild, - +metadata.xml: - Initial import. Modififed ebuild from originally submitted by Xavier - Fernández i Marín, bug #317741 - diff --git a/sci-mathematics/jags/Manifest b/sci-mathematics/jags/Manifest deleted file mode 100644 index 355d80f..0000000 --- a/sci-mathematics/jags/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST JAGS-2.2.0.tar.gz 1621102 RMD160 a8c56a3922d890f27111fea4fc088b408153a7f7 SHA1 83d381619f552830e3a6312a70969b46520cc7fe SHA256 6615207cc19463c6398a8c5d02bfc0e3a659928d7da928396f95a63409addd04 -EBUILD jags-2.2.0.ebuild 851 RMD160 5fab71265ec44e1ecb16e51bad4ec6e5d36a65c8 SHA1 f4a5676e9f9b77e8bd93f5fa7d0815ca9b4117cc SHA256 2813bccd91ef3c809949fd7ecc7c1ca1e95695ae3b83cd0fc85a96c5ec5d249f -MISC ChangeLog 574 RMD160 e1028f3fd1c8dbe0c65702904e8ee4eb55c26d5e SHA1 c6f480e085368a743d085a2a194e879fbf197337 SHA256 f51404e55ad6759815f2230238f55d6cc4da251676493bcb58c0bce856150795 -MISC metadata.xml 670 RMD160 324b5487e94bbf8ab5673a9e1ab96fa732e72554 SHA1 162946a6d7276a5d7be5dff141be6a23d93125be SHA256 4c66821b30a3d7a28f5cce74ad3ead7999ace229fd66d3ebccb278a7d244300f diff --git a/sci-mathematics/jags/jags-2.2.0.ebuild b/sci-mathematics/jags/jags-2.2.0.ebuild deleted file mode 100644 index 249bab1..0000000 --- a/sci-mathematics/jags/jags-2.2.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/jags/jags-2.2.0.ebuild,v 1.1 2011/02/12 11:50:38 tomka Exp $ - -EAPI=2 -inherit autotools-utils - -MYP="JAGS-${PV}" - -DESCRIPTION="Just Another Gibbs Sampler for Bayesian MCMC simulation" -HOMEPAGE="http://www-fis.iarc.fr/~martyn/software/jags/" -SRC_URI="mirror://sourceforge/project/mcmc-jags/JAGS/2.x/Source/${MYP}.tar.gz" -LICENSE="GPL-2" -IUSE="" - -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -RDEPEND="virtual/blas - virtual/lapack" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -S="${WORKDIR}/${MYP}" - -DOCS=(README NEWS TODO AUTHORS) - -src_configure() { - myeconfags=( - --with-blas="$(pkg-config --libs blas)" - --with-lapack="$(pkg-config --libs lapack)" - ) - autotools-utils_src_configure -} diff --git a/sci-mathematics/jags/metadata.xml b/sci-mathematics/jags/metadata.xml deleted file mode 100644 index cfbc499..0000000 --- a/sci-mathematics/jags/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>sci-mathematics</herd> -<longdescription lang="en"> - JAGS is Just Another Gibbs Sampler. It is a program for analysis of - Bayesian hierarchical models using Markov Chain Monte Carlo (MCMC) - simulation not wholly unlike BUGS. - JAGS was written with three aims in mind: - * To have an engine for the BUGS language that runs on Unix - * To be extensible, allowing users to write their own functions, - distributions and samplers. - * To be a plaftorm for experimentation with ideas in Bayesian modelling -</longdescription> -</pkgmetadata> diff --git a/scripts/bootstrap-rap.sh b/scripts/bootstrap-rap.sh deleted file mode 100755 index 30823d8..0000000 --- a/scripts/bootstrap-rap.sh +++ /dev/null @@ -1,2038 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2006-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Id: bootstrap-prefix.sh 61665 2013-08-01 07:31:22Z grobian $ - -trap 'exit 1' TERM KILL INT QUIT ABRT - -# some basic output functions -eerror() { echo "!!! $*" 1>&2; } -einfo() { echo "* $*"; } - -# prefer gtar over tar -[[ x$(type -t gtar) == "xfile" ]] \ - && TAR="gtar" \ - || TAR="tar" - -## Functions Start Here - -econf() { - ${CONFIG_SHELL} ./configure \ - --host=${CHOST} \ - --prefix="${ROOT}"/usr \ - --mandir="${ROOT}"/usr/share/man \ - --infodir="${ROOT}"/usr/share/info \ - --datadir="${ROOT}"/usr/share \ - --sysconfdir="${ROOT}"/etc \ - --localstatedir="${ROOT}"/var/lib \ - --build=${CHOST} \ - "$@" || return 1 -} - -efetch() { - if [[ ! -e ${DISTDIR}/${1##*/} ]] ; then - if [[ -z ${FETCH_COMMAND} ]] ; then - # Try to find a download manager, we only deal with wget, - # curl, FreeBSD's fetch and ftp. - if [[ x$(type -t wget) == "xfile" ]] ; then - FETCH_COMMAND="wget" - elif [[ x$(type -t ftp) == "xfile" ]] ; then - FETCH_COMMAND="ftp" - elif [[ x$(type -t curl) == "xfile" ]] ; then - einfo "WARNING: curl doesn't fail when downloading fails, please check its output carefully!" - FETCH_COMMAND="curl -L -O" - elif [[ x$(type -t fetch) == "xfile" ]] ; then - FETCH_COMMAND="fetch" - else - eerror "no suitable download manager found (need wget, curl, fetch or ftp)" - eerror "could not download ${1##*/}" - exit 1 - fi - fi - - mkdir -p "${DISTDIR}" >& /dev/null - einfo "Fetching ${1##*/}" - pushd "${DISTDIR}" > /dev/null - # try for mirrors first, then try given location - ${FETCH_COMMAND} "${GENTOO_MIRRORS}/distfiles/${1##*/}" - [[ ! -f ${1##*/} && ${1} != ${GENTOO_MIRRORS}/distfiles/${1##*/} ]] \ - && ${FETCH_COMMAND} "$1" - if [[ ! -f ${1##*/} ]] ; then - eerror "downloading ${1} failed!" - return 1 - fi - popd > /dev/null - fi - return 0 -} - -# template -# bootstrap_() { -# PV= -# A= -# einfo "Bootstrapping ${A%-*}" - -# efetch ${A} || return 1 - -# einfo "Unpacking ${A%-*}" -# export S="${PORTAGE_TMPDIR}/${PN}" -# rm -rf ${S} -# mkdir -p ${S} -# cd ${S} -# $TAR -zxf ${DISTDIR}/${A} || return 1 -# S=${S}/${PN}-${PV} -# cd ${S} - -# einfo "Compiling ${A%-*}" -# econf || return 1 -# $MAKE ${MAKEOPTS} || return 1 - -# einfo "Installing ${A%-*}" -# $MAKE install || return 1 - -# einfo "${A%-*} successfully bootstrapped" -# } - -set_profile() { - # switch profiles in used for different phases of stage3 - # Phase 1: bootstrap base system on glibc - # Phase 2: final - local profile - case $1 in - 1) profile="${PORTDIR_RAP}"/profiles/bootstrap/glibc ;; - 2) profile="${PORTDIR_RAP}"/profiles/$(sed 's,../,,' < "${PORTDIR_RAP}"/profiles/bootstrap/parent) ;; - esac - - rm -f ${ROOT}/etc/portage/make.profile - ln -s "${profile}" "${ROOT}"/etc/portage/make.profile - local file=make.defaults - [[ -e "${profile}"/${file}.in ]] && \ - sed "s,@GENTOO_PORTAGE_EPREFIX@,${ROOT},g" "${profile}"/${file}.in > "${profile}"/${file} - - einfo "Your profile is set to ${profile} at phase $1." -} - -bootstrap_setup() { - local profile="" - local keywords="" - local ldflags_make_defaults="" - local extra_make_globals="" - einfo "setting up some guessed defaults" - case ${CHOST} in - powerpc-apple-darwin7) - profile="${PORTDIR}/profiles/prefix/darwin/macos/10.3" - ldflags_make_defaults="LDFLAGS=\"-Wl,-search_paths_first -L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - ;; - powerpc-apple-darwin[89]) - rev=${CHOST##*darwin} - profile="${PORTDIR}/profiles/prefix/darwin/macos/10.$((rev - 4))/ppc" - ldflags_make_defaults="LDFLAGS=\"-Wl,-search_paths_first -L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - ;; - powerpc64-apple-darwin[89]) - rev=${CHOST##*darwin} - profile="${PORTDIR}/profiles/prefix/darwin/macos/10.$((rev - 4))/ppc64" - ldflags_make_defaults="LDFLAGS=\"-Wl,-search_paths_first -L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - extra_make_globals=" -CC='gcc -m64' -CXX='g++ -m64' -HOSTCC='gcc -m64' -" - ;; - i*86-apple-darwin[89]) - rev=${CHOST##*darwin} - profile="${PORTDIR}/profiles/prefix/darwin/macos/10.$((rev - 4))/x86" - ldflags_make_defaults="LDFLAGS=\"-Wl,-search_paths_first -L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - ;; - i*86-apple-darwin1[012]) - rev=${CHOST##*darwin} - profile="${PORTDIR}/profiles/prefix/darwin/macos/10.$((rev - 4))/x86" - ldflags_make_defaults="LDFLAGS=\"-Wl,-search_paths_first -L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - extra_make_globals=" -CC='gcc -m32' -CXX='g++ -m32' -HOSTCC='gcc -m32' -" - ;; - x86_64-apple-darwin9|x86_64-apple-darwin1[012]) - rev=${CHOST##*darwin} - profile="${PORTDIR}/profiles/prefix/darwin/macos/10.$((rev - 4))/x64" - ldflags_make_defaults="LDFLAGS=\"-Wl,-search_paths_first -L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - extra_make_globals=" -CC='gcc -m64' -CXX='g++ -m64' -HOSTCC='gcc -m64' -" - ;; - i*86-pc-linux-gnu) - profile="../default/linux/x86/13.0/rap" - ;; - x86_64-pc-linux-gnu) - profile="../default/linux/amd64/13.0/rap" - ;; - ia64-pc-linux-gnu) - profile="${PORTDIR}/profiles/prefix/linux/ia64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - powerpc-unknown-linux-gnu) - profile="${PORTDIR}/profiles/prefix/linux/ppc" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - powerpc64-unknown-linux-gnu) - profile="${PORTDIR}/profiles/prefix/linux/ppc64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - armv7a-hardfloat-linux-gnueabi) - profile="../default/linux/arm/13.0/armv7a/rap" - ;; - armv5tel-softfloat-linux-gnueabi) - profile="../default/linux/arm/13.0/armv5te/rap" - ;; - sparc-sun-solaris2.9) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.9/sparc" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - ;; - sparcv9-sun-solaris2.9) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.9/sparc64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - extra_make_globals=" -CC='gcc -m64' -CXX='g++ -m64' -HOSTCC='gcc -m64' -" - # we need this, or binutils can't link, can't add it to -L, - # since then binutils breaks on finding an old libiberty.a - # from there instead of its own - cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/usr/lib/ - ;; - i386-pc-solaris2.10) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.10/x86" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - ;; - x86_64-pc-solaris2.10) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.10/x64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - extra_make_globals=" -CC='gcc -m64' -CXX='g++ -m64' -HOSTCC='gcc -m64' -" - # we need this, or binutils can't link, can't add it to -L, - # since then binutils breaks on finding an old libiberty.a - # from there instead of its own - cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/usr/lib/ - ;; - sparc-sun-solaris2.10) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.10/sparc" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - ;; - sparcv9-sun-solaris2.10) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.10/sparc64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - extra_make_globals=" -CC='gcc -m64' -CXX='g++ -m64' -HOSTCC='gcc -m64' -" - # we need this, or binutils can't link, can't add it to -L, - # since then binutils breaks on finding an old libiberty.a - # from there instead of its own - cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/usr/lib/ - ;; - i386-pc-solaris2.11) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.11/x86" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - ;; - x86_64-pc-solaris2.11) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.11/x64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - extra_make_globals=" -CC='gcc -m64' -CXX='g++ -m64' -HOSTCC='gcc -m64' -" - # we need this, or binutils can't link, can't add it to -L, - # since then binutils breaks on finding an old libiberty.a - # from there instead of its own - cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/usr/lib/ - ;; - sparc-sun-solaris2.11) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.11/sparc" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - ;; - sparcv9-sun-solaris2.11) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.11/sparc64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - extra_make_globals=" -CC='gcc -m64' -CXX='g++ -m64' -HOSTCC='gcc -m64' -" - # we need this, or binutils can't link, can't add it to -L, - # since then binutils breaks on finding an old libiberty.a - # from there instead of its own - cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/usr/lib/ - ;; - powerpc-ibm-aix*) - profile="${PORTDIR}/profiles/prefix/aix/${CHOST#powerpc-ibm-aix}/ppc" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - ;; - mips-sgi-irix*) - profile="${PORTDIR}/profiles/prefix/irix/${CHOST#mips-sgi-irix}/mips" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - ;; - i586-pc-interix*) - profile="${PORTDIR}/profiles/prefix/windows/interix/${CHOST#i586-pc-interix}/x86" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - ;; - i586-pc-winnt*) - profile="${PORTDIR}/profiles/prefix/windows/winnt/${CHOST#i586-pc-winnt}/x86" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - ;; - i686-pc-cygwin*) - profile="${PORTDIR}/profiles/prefix/windows/cygwin/${CHOST#i686-pc-cygwin}/x86" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - ;; - hppa64*-hp-hpux11*) - profile="${PORTDIR}/profiles/prefix/hpux/B.11${CHOST#hppa*-hpux11}/hppa64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib -L/usr/local/lib -R/usr/local/lib\"" - ;; - hppa2.0*-hp-hpux11*) - profile="${PORTDIR}/profiles/prefix/hpux/B.11${CHOST#hppa*-hpux11}/hppa2.0" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib -L/usr/local/lib -R/usr/local/lib\"" - ;; - ia64-hp-hpux11*) - profile="${PORTDIR}/profiles/prefix/hpux/B.11${CHOST#ia64-hp-hpux11}/ia64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib -L/usr/local/lib -R/usr/local/lib\"" - ;; - i386-pc-freebsd*) - profile="${PORTDIR}/profiles/prefix/bsd/freebsd/${CHOST#i386-pc-freebsd}/x86" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - x86_64-pc-freebsd*) - profile="${PORTDIR}/profiles/prefix/bsd/freebsd/${CHOST#x86_64-pc-freebsd}/x64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - i386-pc-netbsd*) - profile="${PORTDIR}/profiles/prefix/bsd/netbsd/${CHOST#i386-pc-netbsdelf}/x86" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - powerpc-unknown-openbsd*) - profile="${PORTDIR}/profiles/prefix/bsd/openbsd/${CHOST#powerpc-unknown-openbsd}/ppc" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - i386-pc-openbsd*) - profile="${PORTDIR}/profiles/prefix/bsd/openbsd/${CHOST#i386-pc-openbsd}/x86" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - x86_64-pc-openbsd*) - profile="${PORTDIR}/profiles/prefix/bsd/openbsd/${CHOST#x86_64-pc-openbsd}/x64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - *) - einfo "UNKNOWN ARCH: You need to set up a make.profile symlink to a" - einfo "profile in ${PORTDIR} for your CHOST ${CHOST}" - ;; - esac - - echo "${profile}" > "${PORTDIR_RAP}"/profiles/bootstrap/parent - - # REMOVE the following after migrating to gentoo-x86 base - echo "PORTDIR_OVERLAY=\"${PORTDIR_RAP}\"" >> "${ROOT}"/etc/portage/make.conf - - # don't inject rpath at all. - echo ">=sys-devel/binutils-config-3-r03.1" >> "${ROOT}"/etc/portage/package.mask -} - -do_tree() { - for x in etc{,/portage} {,usr/}{,s}bin usr/local var/tmp var/lib/portage var/log/portage var/db; - do - [[ -d ${ROOT}/${x} ]] || mkdir -p "${ROOT}/${x}" - done - if [[ ! -e ${PORTDIR}/.unpacked ]]; then - efetch "$1/$2" || return 1 - [[ -e ${PORTDIR} ]] || mkdir -p ${PORTDIR} - einfo "Unpacking, this may take a while" - bzip2 -dc ${DISTDIR}/$2 | $TAR -xf - -C ${PORTDIR%portage} || return 1 - touch ${PORTDIR}/.unpacked - fi -} - -bootstrap_tree() { - local PV="20130724" - if [[ -n ${LATEST_TREE_YES} ]]; then - do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2 - else - do_tree http://prefix.gentooexperimental.org/distfiles prefix-overlay-${PV}.tar.bz2 - fi - - # this is ugly, we have to put the temperory rap overlay somewhere - PORTDIR="${PORTDIR_RAP}" \ - do_tree http://dev.gentoo.org/~heroxbd rap-overlay.tar.bz2 -} - -bootstrap_latest_tree() { - # kept here for compatibility reasons - einfo "This function 'latest_tree' is deprecated and will be" - einfo "removed in the future, please set LATEST_TREE_YES=1 in the env" - LATEST_TREE_YES=1 bootstrap_tree -} - -bootstrap_startscript() { - local theshell=${SHELL##*/} - if [[ ${theshell} == "sh" ]] ; then - einfo "sh is a generic shell, using bash instead" - theshell="bash" - fi - if [[ ${theshell} == "csh" ]] ; then - einfo "csh is a prehistoric shell not available in Gentoo, switching to tcsh instead" - theshell="tcsh" - fi - einfo "Trying to emerge the shell you use, if necessary by running:" - einfo "emerge -u ${theshell}" - if ! emerge -u ${theshell} ; then - eerror "Your shell is not available in portage, hence we cannot" > /dev/stderr - eerror "automate starting your prefix, set SHELL and rerun this script" > /dev/stderr - return -1 - fi - einfo "Creating the Prefix start script (startprefix)" - # currently I think right into the prefix is the best location, as - # putting it in /bin or /usr/bin just hides it some more for the - # user - sed \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${ROOT}|g" \ - "${ROOT}"/usr/portage/scripts/startprefix.in \ - > "${ROOT}"/startprefix - chmod 755 "${ROOT}"/startprefix - einfo "To start Gentoo Prefix, run the script ${ROOT}/startprefix" - einfo "You can copy this file to a more convenient place if you like." - - # see if PATH is kept/respected - local minPATH="preamble:${BASH%/*}:postlude" - local theirPATH="$(echo 'echo "${PATH}"' | env LS_COLORS= PATH="${minPATH}" $SHELL -l 2>/dev/null | grep "preamble:.*:postlude")" - if [[ ${theirPATH} != *"preamble:"*":postlude"* ]] ; then - einfo "WARNING: your shell initialisation (.cshrc, .bashrc, .profile)" - einfo " seems to overwrite your PATH, this effectively kills" - einfo " your Prefix. Change this to only append to your PATH" - elif [[ ${theirPATH} != "preamble:"* ]] ; then - einfo "WARNING: your shell initialisation (.cshrc, .bashrc, .profile)" - einfo " seems to prepend to your PATH, this might kill your" - einfo " Prefix:" - einfo " ${theirPATH%%preamble:*}" - einfo " You better fix this, YOU HAVE BEEN WARNED!" - fi -} - -bootstrap_portage() { - # Set TESTING_PV in env if you want to test a new portage before bumping the - # STABLE_PV that is known to work. Intended for power users only. - ## It is critical that STABLE_PV is the lastest (non-masked) version that is - ## included in the snapshot for bootstrap_tree. - STABLE_PV="2.2.01.22124" - PV="${TESTING_PV:-${STABLE_PV}}" - A=prefix-portage-${PV}.tar.bz2 - einfo "Bootstrapping ${A%-*}" - - efetch ${DISTFILES_URL}/${A} || return 1 - - einfo "Unpacking ${A%-*}" - export S="${PORTAGE_TMPDIR}"/portage-${PV} - ptmp=${S} - rm -rf "${S}" >& /dev/null - mkdir -p "${S}" >& /dev/null - cd "${S}" - bzip2 -dc "${DISTDIR}/${A}" | $TAR -xf - || return 1 - S="${S}/prefix-portage-${PV}" - cd "${S}" - - # disable ipc - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ - -i pym/_emerge/AbstractEbuildProcess.py || \ - return 1 - - # Portage checks for valid shebangs. These may (xz-utils) originate - # in CONFIG_SHELL (AIX), which originates in PORTAGE_BASH then. - # So we need to ensure portage's bash is valid as shebang too. - mkdir -p ${ROOT}/bin || return 1 - [[ -x ${ROOT}/bin/bash ]] || [[ ! -x ${ROOT}/tmp/bin/bash ]] || ln -s ${ROOT}/tmp/bin/bash ${ROOT}/bin/bash || return 1 - [[ -x ${ROOT}/bin/bash ]] || ln -s ${BASH} ${ROOT}/bin/bash || return 1 - export PORTAGE_BASH=${ROOT}/bin/bash - - einfo "Compiling ${A%-*}" - econf \ - --with-offset-prefix="${ROOT}" \ - --with-portage-user="`id -un`" \ - --with-portage-group="`id -gn`" \ - --mandir="${ROOT}/automatically-removed" \ - --with-extra-path="${ROOT}/tmp/bin:${ROOT}/tmp/usr/bin:/bin:/usr/bin:${PATH}" \ - || return 1 - $MAKE ${MAKEOPTS} || return 1 - - einfo "Installing ${A%-*}" - $MAKE install || return 1 - - bootstrap_setup - - cd "${ROOT}" - rm -Rf ${ptmp} >& /dev/null - - # Some people will skip the tree() step and hence var/log is not created - # As such, portage complains.. - [[ ! -d $ROOT/var/log ]] && mkdir ${ROOT}/var/log - - # during bootstrap_portage(), man pages are not compressed. This is - # problematic once you have a working prefix. So, remove them now. - rm -rf "${ROOT}/automatically-removed" - - # in Prefix the sed wrapper is deadly, so kill it - rm -f "${ROOT}"/usr/lib/portage/bin/ebuild-helpers/sed - - einfo "${A%-*} successfully bootstrapped" -} - -prep_gcc-apple() { - - GCC_PV=5341 - GCC_A="gcc-${GCC_PV}.tar.gz" - TAROPTS="-zxf" - - efetch ${GCC_APPLE_URL}/${GCC_A} || return 1 - -} - -prep_gcc-fsf() { - - GCC_PV=4.1.2 - GCC_A=gcc-${GCC_PV}.tar.bz2 - TAROPTS="-jxf" - - efetch ${GENTOO_MIRRORS}/distfiles/${GCC_A} || return 1 - -} - -bootstrap_gnu() { - local PN PV A S - PN=$1 - PV=$2 - - einfo "Bootstrapping ${PN}" - - for t in tar.gz tar.xz tar.bz2 tar ; do - A=${PN}-${PV}.${t} - - # save the user some useless downloading - if [[ ${t} == tar.gz ]] ; then - type -P gzip > /dev/null || continue - fi - if [[ ${t} == tar.xz ]] ; then - type -P xz > /dev/null || continue - fi - if [[ ${t} == tar.bz2 ]] ; then - type -P bzip2 > /dev/null || continue - fi - - URL=${GNU_URL}/${PN}/${A} - [[ ${PN} == gcc ]] && URL=${GNU_URL}/${PN}/${PN}-${PV}/${A} - efetch ${URL} || continue - - einfo "Unpacking ${A%-*}" - S="${PORTAGE_TMPDIR}/${PN}-${PV}" - rm -rf "${S}" - mkdir -p "${S}" - cd "${S}" - if [[ ${t} == "tar.gz" ]] ; then - gzip -dc "${DISTDIR}"/${URL##*/} | $TAR -xf - || continue - elif [[ ${t} == "tar.xz" ]] ; then - xz -dc "${DISTDIR}"/${URL##*/} | $TAR -xf - || continue - elif [[ ${t} == "tar.bz2" ]] ; then - bzip2 -dc "${DISTDIR}"/${URL##*/} | $TAR -xf - || continue - elif [[ ${t} == "tar" ]] ; then - $TAR -xf "${DISTDIR}"/${A} || continue - else - einfo "unhandled extension: $t" - return 1 - fi - break - done - S="${S}"/${PN}-${PV} - [[ -d ${S} ]] || return 1 - cd "${S}" || return 1 - - local myconf="" - if [[ ${PN} == "grep" ]] ; then - # Solaris and OSX don't like it when --disable-nls is set, - # so just don't set it at all. - # Solaris 11 has a messed up prce installation. We don't need - # it anyway, so just disable it - myconf="${myconf} --disable-perl-regexp" - # Except interix really needs it for grep. - [[ $CHOST == *interix* ]] && myconf="${myconf} --disable-nls" - fi - - # AIX doesn't like --enable-nls in general during bootstrap - [[ $CHOST == *-aix* ]] && myconf="${myconf} --disable-nls" - # AIX 7.1 has fstatat(), but broken without APAR IV23716: - [[ $CHOST == *-aix7* ]] && export ac_cv_func_fstatat=no - - # NetBSD has strange openssl headers, which make wget fail. - [[ $CHOST == *-netbsd* ]] && myconf="${myconf} --disable-ntlm" - - # Darwin9 in particular doesn't compile when using system readline, - # but we don't need any groovy input at all, so just disable it - [[ ${PN} == "bash" ]] && myconf="${myconf} --disable-readline" - - # Don't do ACL stuff on Darwin, especially Darwin9 will make - # coreutils completely useless (install failing on everything) - # Don't try using gmp either, it may be that just the library is - # there, and if so, the buildsystem assumes the header exists too - [[ ${PN} == "coreutils" ]] && \ - myconf="${myconf} --disable-acl --without-gmp" - - [[ ${PN} == "gcc" ]] && myconf="${myconf} --disable-bootstrap --enable-languages=c\ - --disable-multilib" - - if [[ ${PN} == "coreutils" && ${CHOST} == *-interix* ]] ; then - # Interix doesn't have filesystem listing stuff, but that means all - # other utilities but df aren't useless at all, so don't die - sed -i -e '/^if test -z "$ac_list_mounted_fs"; then$/c\if test 1 = 0; then' configure - - # try to make id() not poll the entire domain before returning - export CFLAGS="${CFLAGS} -Dgetgrgid=getgrgid_nomembers -Dgetgrent=getgrent_nomembers -Dgetgrnam=getgrnam_nomembers" - - # Fix a compilation error due to a missing definition - sed -i -e '/^#include "fcntl-safer.h"$/a\#define ESTALE -1' lib/savewd.c - fi - - if [[ ${PN} == "tar" && ${CHOST} == *-hpux* ]] ; then - # Fix a compilation error due to a missing definition - export CPPFLAGS="${CPPFLAGS} -DCHAR_BIT=8" - fi - - # Gentoo Bug 400831, fails on Ubuntu with libssl-dev installed - [[ ${PN} == "wget" ]] && myconf="${myconf} --without-ssl" - - einfo "Compiling ${PN}" - econf ${myconf} || return 1 - if [[ ${PN} == "make" && $(type -t $MAKE) != "file" ]]; then - ./build.sh || return 1 - else - $MAKE ${MAKEOPTS} || return 1 - fi - - einfo "Installing ${PN}" - if [[ ${PN} == "make" && $(type -t $MAKE) != "file" ]]; then - ./make install MAKE="${S}/make" || return 1 - else - $MAKE install || return 1 - fi - - cd "${ROOT}" - rm -Rf "${S}" - einfo "${PN}-${PV} successfully bootstrapped" -} - -bootstrap_python() { - PV=2.7.3 - A=python-${PV}-patched.tar.bz2 - - [[ ${CHOST} == *-aix* ]] && A=Python-${PV}.tar.bz2 # patched one breaks - - einfo "Bootstrapping ${A%-*}" - - # don't really want to put this on the mirror, since they are - # non-vanilla sources, bit specific for us - efetch ${DISTFILES_URL}/${A} || return 1 - - einfo "Unpacking ${A%%-*}" - export S="${PORTAGE_TMPDIR}/python-${PV}" - rm -rf "${S}" - mkdir -p "${S}" - cd "${S}" - bzip2 -dc "${DISTDIR}"/${A} | $TAR -xf - || return 1 - S="${S}"/Python-${PV} - cd "${S}" - - local myconf="" - - case $CHOST in - *-*-aix*) - # Python stubbornly insists on using cc_r to compile. We - # know better, so force it to listen to us - myconf="${myconf} --with-gcc=yes" - ;; - *-openbsd*) - CFLAGS="${CFLAGS} -D_BSD_SOURCE=1" - ;; - *-linux*) - # Bug 382263: make sure Python will know about the libdir in use for - # the current arch - libdir="-L/usr/lib/$(gcc -print-multi-os-directory)" - ;; - x86_64-*-solaris*|sparcv9-*-solaris*) - # Like above, make Python know where GCC's 64-bits - # libgcc_s.so is on Solaris - libdir="-L/usr/sfw/lib/64" - ;; - esac - - # python refuses to find the zlib headers that are built in the - # offset - export CPPFLAGS="-I$EPREFIX/tmp/usr/include" - export LDFLAGS="-L$EPREFIX/tmp/usr/lib" - # set correct flags for runtime for ELF platforms - case $CHOST in - *-*bsd*|*-linux*) - # GNU ld - export LDFLAGS="${LDFLAGS} -Wl,-rpath,$EPREFIX/tmp/usr/lib ${libdir}" - ;; - *-solaris*) - # Sun ld - export LDFLAGS="${LDFLAGS} -R$EPREFIX/tmp/usr/lib ${libdir}" - ;; - esac - - # if the user has a $HOME/.pydistutils.cfg file, the python - # installation is going to be screwed up, as reported by users, so - # just make sure Python won't find it - export HOME="${S}" - - export PYTHON_DISABLE_MODULES="bsddb bsddb185 bz2 crypt _ctypes_test _curses _curses_panel dbm _elementtree gdbm _locale nis pyexpat readline _sqlite3 _tkinter" - export PYTHON_DISABLE_SSL=1 - export OPT="${CFLAGS}" - - einfo "Compiling ${A%-*}" - econf \ - --disable-toolbox-glue \ - --disable-ipv6 \ - --disable-shared \ - ${myconf} || return 1 - $MAKE ${MAKEOPTS} || return 1 - - einfo "Installing ${A%-*}" - $MAKE -k install || echo "??? Python failed to install *sigh* continuing anyway" - cd "${ROOT}"/usr/bin - ln -sf python${PV%.*} python - cd "${ROOT}"/usr/lib - # messes up python emerges, and shouldn't be necessary for anything - # http://forums.gentoo.org/viewtopic-p-6890526.html - rm -f libpython${PV%.*}.a - - einfo "${A%-*} bootstrapped" -} - -bootstrap_zlib_core() { - # use 1.2.5 by default, current bootstrap guides - PV="${1:-1.2.5}" - A=zlib-${PV}.tar.gz - - einfo "Bootstrapping ${A%-*}" - - if ! efetch ${GENTOO_MIRRORS}/distfiles/${A} ; then - A=zlib-${PV}.tar.bz2 - efetch ${GENTOO_MIRRORS}/distfiles/${A} || return 1 - fi - - einfo "Unpacking ${A%%-*}" - export S="${PORTAGE_TMPDIR}/zlib-${PV}" - rm -rf "${S}" - mkdir -p "${S}" - cd "${S}" - if [[ ${A} == *.tar.gz ]] ; then - gzip -dc "${DISTDIR}"/${A} | $TAR -xf - || return 1 - else - bzip2 -dc "${DISTDIR}"/${A} | $TAR -xf - || return 1 - fi - S="${S}"/zlib-${PV} - cd "${S}" - - if [[ ${CHOST} == x86_64-*-* || ${CHOST} == sparcv9-*-* ]] ; then - # 64-bits targets need zlib as library (not just to unpack), - # hence we need to make sure that we really bootstrap this - # 64-bits (in contrast to the tools which we don't care if they - # are 32-bits) - export CC="gcc -m64" - elif [[ ${CHOST} == i?86-*-* ]] ; then - # This is important for bootstraps which are 64-native, but we - # want 32-bits, such as most Linuxes, and more recent OSX. - # OS X Lion and up default to a 64-bits userland, so force the - # compiler to 32-bits code generation if requested here - export CC="gcc -m32" - fi - # 1.2.5 suffers from a concurrency problem - [[ ${PV} == 1.2.5 ]] && MAKEOPTS= - - einfo "Compiling ${A%-*}" - CHOST= ${CONFIG_SHELL} ./configure --prefix="${ROOT}"/usr || return 1 - $MAKE ${MAKEOPTS} || return 1 - - einfo "Installing ${A%-*}" - $MAKE install || return 1 - - # this lib causes issues when emerging python again on Solaris - # because the tmp lib path is in the library search path there - rm -Rf "${ROOT}"/usr/lib/libz*.a - - einfo "${A%-*} bootstrapped" -} - -bootstrap_zlib() { - bootstrap_zlib_core 1.2.8 || bootstrap_zlib_core 1.2.7 || \ - bootstrap_zlib_core 1.2.6 || bootstrap_zlib_core 1.2.5 -} - -bootstrap_gmp() { - bootstrap_gnu gmp 5.0.5 -} - -bootstrap_mpfr() { - export CPPFLAGS="-I${ROOT}/usr/include" - export LDFLAGS="-L${ROOT}/usr/lib" - bootstrap_gnu mpfr 3.1.2 -} - -bootstrap_mpc() { - export CPPFLAGS="-I${ROOT}/usr/include" - export LDFLAGS="-L${ROOT}/usr/lib" - bootstrap_gnu mpc 1.0.1 -} - -bootstrap_gcc() { - export CPPFLAGS="-I${ROOT}/usr/include" - export LDFLAGS="-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib" - bootstrap_gnu gcc 4.7.3 -} - -bootstrap_sed() { - bootstrap_gnu sed 4.2.1 -} - -bootstrap_findutils() { - bootstrap_gnu findutils 4.5.10 || bootstrap_gnu findutils 4.2.33 -} - -bootstrap_wget() { - bootstrap_gnu wget 1.13.4 -} - -bootstrap_grep() { - # don't use 2.13, it contains a bug that bites, bug #425668 - # 2.9 is the last version provided as tar.gz (platforms without xz) - # 2.7 is necessary for Solaris/OpenIndiana (2.8, 2.9 fail to configure) - bootstrap_gnu grep 2.14 || bootstrap_gnu grep 2.12 || \ - bootstrap_gnu grep 2.9 || bootstrap_gnu grep 2.7 -} - -bootstrap_coreutils() { - # 8.12 for FreeBSD 9.1, bug #415439 - # 8.16 is the last version released as tar.gz - bootstrap_gnu coreutils 8.17 || bootstrap_gnu coreutils 8.16 || \ - bootstrap_gnu coreutils 8.12 -} - -bootstrap_tar() { - bootstrap_gnu tar 1.26 -} - -bootstrap_make() { - bootstrap_gnu make 3.82 -} - -bootstrap_patch() { - # 2.5.9 needed for OSX 10.6.x - bootstrap_gnu patch 2.7.1 || bootstrap_gnu patch 2.6.1 || \ - bootstrap_gnu patch 2.5.9 || bootstrap_gnu patch 2.5.4 -} - -bootstrap_gawk() { - bootstrap_gnu gawk 4.0.1 || bootstrap_gnu gawk 4.0.0 || \ - bootstrap_gnu gawk 3.1.8 -} - -bootstrap_binutils() { - bootstrap_gnu binutils 2.23 -} - -bootstrap_texinfo() { - bootstrap_gnu texinfo 4.8 -} - -bootstrap_bash() { - bootstrap_gnu bash 4.2 -} - -bootstrap_bison() { - bootstrap_gnu bison 2.6.2 || bootstrap_gnu bison 2.6.1 || \ - bootstrap_gnu bison 2.6 || bootstrap_gnu bison 2.5.1 || \ - bootstrap_gnu bison 2.4 -} - -bootstrap_m4() { - bootstrap_gnu m4 1.4.16 || bootstrap_gnu m4 1.4.15 -} - -bootstrap_gzip() { - bootstrap_gnu gzip 1.4 -} - -bootstrap_bzip2() { - local PN PV A S - PN=bzip2 - PV=1.0.6 - A=${PN}-${PV}.tar.gz - einfo "Bootstrapping ${A%-*}" - - efetch ${GENTOO_MIRRORS}/distfiles/${A} || return 1 - - einfo "Unpacking ${A%-*}" - S="${PORTAGE_TMPDIR}/${PN}-${PV}" - rm -rf "${S}" - mkdir -p "${S}" - cd "${S}" - gzip -dc "${DISTDIR}"/${A} | $TAR -xf - || return 1 - S="${S}"/${PN}-${PV} - cd "${S}" - - einfo "Compiling ${A%-*}" - $MAKE || return 1 - - einfo "Installing ${A%-*}" - $MAKE PREFIX="${ROOT}"/usr install || return 1 - - cd "${ROOT}" - rm -Rf "${S}" - einfo "${A%-*} successfully bootstrapped" -} - -bootstrap_stage1() { - if [[ ${ROOT} != */tmp ]] ; then - eerror "stage1 can only be used for paths that end in '/tmp'" - return 1 - fi - - # NOTE: stage1 compiles all tools (no libraries) in the native - # bits-size of the compiler, which needs not to match what we're - # bootstrapping for. This is no problem since they're just tools, - # for which it really doesn't matter how they run, as long AS they - # run. For libraries, this is different, since they are relied on - # by packages we emerge lateron. - # Changing this to compile the tools for the bits the bootstrap is - # for, is a BAD idea, since we're extremely fragile here, so - # whatever the native toolchain is here, is what in general works - # best. - - # run all bootstrap_* commands in a subshell since the targets - # frequently pollute the environment using exports which affect - # packages following (e.g. zlib builds 64-bits) - - # don't rely on $MAKE, if make == gmake packages that call 'make' fail - [[ $(make --version 2>&1) == *GNU* ]] || (bootstrap_make) || return 1 - type -P wget > /dev/null || (bootstrap_wget) || return 1 - [[ $(sed --version 2>&1) == *GNU* ]] || (bootstrap_sed) || return 1 - [[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] || (bootstrap_m4) || return 1 - [[ $(bison --version 2>&1) == *"(GNU Bison) 2."[345678]* ]] \ - || (bootstrap_bison) || return 1 - [[ $(uniq --version 2>&1) == *"(GNU coreutils) "[6789]* ]] \ - || (bootstrap_coreutils) || return 1 - [[ $(find --version 2>&1) == *GNU* ]] || (bootstrap_findutils) || return 1 - [[ $(tar --version 2>&1) == *GNU* ]] || (bootstrap_tar) || return 1 - [[ $(patch --version 2>&1) == *"GNU patch 2."7* ]] || (bootstrap_patch) || return 1 - [[ $(grep --version 2>&1) == *GNU* ]] || (bootstrap_grep) || return 1 - [[ $(awk --version < /dev/null 2>&1) == *GNU* ]] || bootstrap_gawk || return 1 - [[ $(bash --version 2>&1) == "GNU bash, version 4."[123456789]* ]] \ - || (bootstrap_bash) || return 1 - if type -P pkg-config > /dev/null ; then - # it IS possible to get here without installing anything in - # tmp/usr/bin, which makes the below fail to happen - mkdir -p "${ROOT}"/usr/bin/ - # hide an existing pkg-config for glib, which first checks - # pkg-config for libffi, and only then the LIBFFI_* vars - # this resolves nasty problems like bug #426302 - # note that an existing pkg-config can be ancient, which glib - # doesn't grok (e.g. Solaris 10) => error - { - echo "#!/bin/sh" - echo "exit 1" - } > "${ROOT}"/usr/bin/pkg-config - chmod 755 "${ROOT}"/usr/bin/pkg-config - fi - type -P bzip2 > /dev/null || (bootstrap_bzip2) || return 1 - # important to have our own (non-flawed one) since Python (from - # Portage) and binutils use it - - ls ${ROOT}/usr/lib/libz.* >/dev/null 2>&1 || (bootstrap_zlib) || return 1 - ls ${ROOT}/usr/lib/libgmp.* >/dev/null 2>&1 || (bootstrap_gmp) || return 1 - ls ${ROOT}/usr/lib/libmpfr.* >/dev/null 2>&1 || (bootstrap_mpfr) || return 1 - ls ${ROOT}/usr/lib/libmpc.* >/dev/null 2>&1 || (bootstrap_mpc) || return 1 - - # too vital to rely on a host-provided one - [[ -x ${ROOT}/usr/bin/python ]] || (bootstrap_python) || return 1 - - # glibc requies >=gcc-4.6 - [[ $(gcc --version 2>&1) == *'gcc ('*') 4.'[678]* ]] || (bootstrap_gcc) || return 1 - - einfo "stage1 successfully finished" -} - -bootstrap_stage2() { - if [[ ${ROOT} == */tmp ]] ; then - eerror "stage2 cannot be used for paths that end in '/tmp'" - return 1 - fi - - # checks itself if things need to be done still - bootstrap_tree || return 1 - [[ -e ${ROOT}/etc/make.globals ]] || bootstrap_portage || return 1 - - einfo "stage2 successfully finished" -} - -bootstrap_stage3() { - if [[ ${ROOT} == */tmp ]] ; then - eerror "stage3 cannot be used for paths that end in '/tmp'" - return 1 - fi - - if ! type -P emerge > /dev/null ; then - eerror "emerge not found, did you bootstrap stage1 and stage2?" - return 1 - fi - - # stage2 as set a profile, which defines CHOST, so unset any CHOST - # we've got here to avoid cross-compilation due to slight - # differences caused by our guessing vs. what the profile sets. - # This happens at least on 32-bits Darwin, with i386 and i686. - # https://bugs.gentoo.org/show_bug.cgi?id=433948 - local bootstrapCHOST=${CHOST} - unset CHOST - - # No longer support gen_usr_ldscript stuff in new bootstraps, this - # must be in line with what eventually ends up in make.conf, see the - # end of this function. We don't do this in bootstrap_setup() - # because in that case we'd also have to cater for getting this - # right with manual bootstraps. - export PREFIX_DISABLE_GEN_USR_LDSCRIPT=yes - - emerge_pkgs() { - local opts=$1 ; shift - local pkg vdb pvdb evdb premerge - for pkg in "$@"; do - vdb=${pkg} - if [[ ${vdb} == "="* ]] ; then - vdb=${vdb#=} - elif [[ ${vdb} == "<"* ]] ; then - vdb=${vdb#<} - vdb=${vdb%-r*} - vdb=${vdb%-*} - vdb=${vdb}-\* - else - vdb=${vdb}-\* - fi - for pvdb in ${ROOT}/var/db/pkg/${vdb%-*}-* ; do - if [[ -d ${pvdb} ]] ; then - evdb=${pvdb##*/} - if [[ ${pkg} == "="* ]] ; then - # exact match required (* should work here) - [[ ${evdb} == ${vdb##*/} ]] && break - else - vdb=${vdb%-*} - evdb=${evdb%-r*} - evdb=${evdb%_p*} - evdb=${evdb%-*} - [[ ${evdb} == ${vdb#*/} ]] && break - fi - fi - pvdb= - done - [[ -n ${pvdb} ]] && continue - # for a valid shebang, we have symlinked bin/bash already - [[ ${pkg} == *"app-shells/bash"* ]] && - premerge="FEATURES='${FEATURES} -collision-protect'" - eval ${premerge} 'emerge -v --oneshot ${opts} "${pkg}"' - [[ $? -eq 0 ]] || return 1 - done - } - - set_profile 1 - # --oneshot --nodeps - local pkgs=( - sys-apps/sed - "<app-shells/bash-4.2_p20" # higher versions require readline - app-arch/xz-utils - sys-apps/baselayout-prefix - sys-devel/m4 - sys-devel/flex - sys-devel/bison - sys-libs/zlib - dev-libs/gmp - dev-libs/mpfr - dev-libs/mpc - sys-kernel/linux-headers - sys-devel/gcc-config - sys-devel/binutils-config - sys-devel/binutils - ) - - emerge_pkgs --nodeps "${pkgs[@]}" || return 1 - - echo 'int main() {}' > test-rpath.c - gcc -o test-rpath test-rpath.c - if readelf -d test-rpath | grep -q rpath; then - cat <<EOF - -Your present toolchain injects rpath into ELF, which causes glibc to -fail. Please disable this feature for the moment and try again. - -EOF - return 1; - fi - - if [[ ! -x "${ROOT}"/usr/bin/perl ]]; then - local perlLoc=$(type -P perl) - if [[ -n ${perlLoc} ]]; then - ln -sf "${perlLoc}" "${ROOT}"/usr/bin/perl - else - echo "We need perl at ${ROOT}/usr/bin/perl to compile glibc." - return 1 - fi - fi - - pkgs=( sys-libs/glibc ) - emerge_pkgs --nodeps "${pkgs[@]}" || return 1 - - # in gcc bootstrap stage 1, xgcc/cc1 and friends may be linked against libgcc_s.so of - # the old gcc, which cannot be found on new RAP. Append that directory to ld.so.conf - # so that our RAP dynamic linker can find it. This will be overwritten by env-update - # afterwards. - local oldGCC - # in case CHOST-gcc is different from gcc in PATH - oldGCC=$(type -P $(portageq envvar CHOST)-gcc) - [[ -n ${oldGCC} ]] || oldGCC=$(type -P gcc) - dirname $(${oldGCC} -print-libgcc-file-name) >> ${ROOT}/etc/ld.so.conf - ${ROOT}/usr/sbin/ldconfig - - pkgs=( sys-devel/gcc ) - emerge_pkgs --nodeps "${pkgs[@]}" || return 1 - - # we need pax-utils this early for OSX (before libiconv - gen_usr_ldscript) - # but also for perl, which uses scanelf/scanmacho to find compatible - # lib-dirs - # --oneshot - local pkgs=( - app-misc/pax-utils # see note above - sys-apps/coreutils - sys-apps/findutils - "<app-arch/tar-1.26-r1" # bug 406131 - sys-apps/grep - sys-apps/gawk - sys-devel/make - sys-libs/zlib - ) - emerge_pkgs "" "${pkgs[@]}" || return 1 - - # --oneshot --nodeps - local pkgs=( - sys-apps/file - app-admin/eselect - dev-util/pkgconf - ) - emerge_pkgs --nodeps "${pkgs[@]}" || return 1 - - # --oneshot - local pkgs=( - net-misc/wget - sys-apps/acl - ) - emerge_pkgs "" "${pkgs[@]}" || return 1 - - # for some yet unknown reason, libxml2 has a problem with zlib, but - # only during this stage, in the emerge -e system phase it is fine - # it boils down to zlib headers replacing gzopen with gzopen64, but - # no gzopen64 prototype being defined, due to libxml.h messing with - # FILE_OFFSET_BITS - # we can work around this by defining NO_LARGEFILE_SOURCE for libxml.h - # since we have the compiler emerged, it's no problem we wipe out - # the -I directions set by the profile - export CPPFLAGS="${CPPFLAGS} -DNO_LARGEFILE_SOURCE" - - # disable collision-protect to overwrite the bootstrapped portage - FEATURES="-collision-protect" emerge_pkgs "" "sys-apps/portage" || return 1 - - unset CPPFLAGS - - if [[ -d ${ROOT}/tmp/var/tmp ]] ; then - rm -Rf "${ROOT}"/tmp || return 1 - mkdir -p "${ROOT}"/tmp || return 1 - fi - - set_profile 2 - - # Portage should figure out itself what it needs to do, if anything - USE=-git emerge -u system || return 1 - - if [[ ! -f ${EPREFIX}/etc/portage/make.conf ]] ; then - { - echo 'USE="unicode nls"' - echo 'CFLAGS="${CFLAGS} -O2 -pipe"' - echo 'CXXFLAGS="${CFLAGS}"' - echo "MAKEOPTS=\"${MAKEOPTS}\"" - echo "# be careful with this one, don't just remove it!" - echo "PREFIX_DISABLE_GEN_USR_LDSCRIPT=yes" - } > "${EPREFIX}"/etc/portage/make.conf - fi - - einfo "stage3 successfully finished" -} - -bootstrap_interactive() { - cat <<"EOF" - - - . - .vir. d$b - .d$$$$$$b. .cd$$b. .d$$b. d$$$$$$$$$$$b .d$$b. .d$$b. - $$$$( )$$$b d$$$()$$$. d$$$$$$$b Q$$$$$$$P$$$P.$$$$$$$b. .$$$$$$$b. - Q$$$$$$$$$$B$$$$$$$$P" d$$$PQ$$$$b. $$$$. .$$$P' `$$$ .$$$P' `$$$ - "$$$$$$$P Q$$$$$$$b d$$$P Q$$$$b $$$$b $$$$b..d$$$ $$$$b..d$$$ - d$$$$$$P" "$$$$$$$$ Q$$$ Q$$$$ $$$$$ `Q$$$$$$$P `Q$$$$$$$P - $$$$$$$P `""""" "" "" Q$$$P "Q$$$P" "Q$$$P" - `Q$$P" """ - - Welcome to the Gentoo Prefix interactive installer! - - - I will attempt to install Gentoo Prefix on your system. To do so, I'll - ask you some questions first. After that, you'll have to practise - patience as your computer and I try to figure out a way to get a lot of - software packages compiled. If everything goes according to plan, - you'll end up with what we call "a Prefix install", but by that time, - I'll tell you more. - - -EOF - [[ ${TODO} == 'noninteractive' ]] && ans=yes || - read -p "Do you want me to start off now? [Yn] " ans - case "${ans}" in - [Yy][Ee][Ss]|[Yy]|"") - : ;; - *) - echo "Right. Aborting..." - exit 1 - ;; - esac - - echo - echo "It seems to me you are '${USER:-$(whoami 2> /dev/null)}' (${UID}), that looks cool to me." - - echo - echo "I'm going to check for some variables in your environment now:" - local flag dvar badflags= - for flag in \ - ASFLAGS \ - CFLAGS \ - CPPFLAGS \ - CXXFLAGS \ - DYLD_LIBRARY_PATH \ - GREP_OPTIONS \ - LDFLAGS \ - LD_LIBRARY_PATH \ - LIBPATH \ - PERL_MM_OPT \ - PKG_CONFIG_PATH \ - PYTHONPATH \ - ; do - # starting on purpose a shell here iso ${!flag} because I want - # to know if the shell initialisation files trigger this - # note that this code is so complex because it handles both - # C-shell as sh - dvar="echo \"((${flag}=\${${flag}}))\"" - dvar="$(echo "${dvar}" | env -i HOME=$HOME $SHELL -l 2>/dev/null)" - if [[ ${dvar} == *"((${flag}="?*"))" ]] ; then - badflags="${badflags} ${flag}" - dvar=${dvar#*((${flag}=} - dvar=${dvar%%))*} - echo " uh oh, ${flag}=${dvar} :(" - else - echo " it appears ${flag} is not set :)" - fi - # unset for the current environment - unset ${flag} - done - if [[ -n ${badflags} ]] ; then - cat << EOF - -Ahem, your shell environment contains some variables I'm allergic to: - ${badflags} -These flags can and will influence the way in which packages compile. -In fact, they have a long standing tradition to break things. I really -prefer to be on my own here. So please make sure you disable these -environment variables in your shell initialisation files. After you've -done that, you can run me again. -EOF - exit 1 - fi - echo - echo "I'm excited! Seems we can finally do something productive now." - - cat << EOF - -Ok, I'm going to do a little bit of guesswork here. Thing is, your -machine appears to be identified by CHOST=${CHOST}. -EOF - case "${CHOST}" in - powerpc*|ppc*|sparc*) - cat << EOF - -To me, it seems to be a big-endian machine. I told you before you need -patience, but with your machine, regardless how many CPUs you have, you -need some more. Context switches are just expensive, and guess what -fork/execs result in all the time. I'm going to make it even worse for -you, configure and make typically are fork/exec bombs. -I'm going to assume you're actually used to having patience with this -machine, which is good, because I really love a box like yours! -EOF - ;; - esac - - # the standard path we want to start with, override anything from - # the user on purpose - PATH="/usr/bin:/bin" - # don't exclude the path to bash if it isn't in a standard location - type -P bash > /dev/null || PATH="${BASH%/bash}:${PATH}" - case "${CHOST}" in - *-solaris*) - cat << EOF - -Ok, this is Solaris, or a derivative like OpenSolaris or OpenIndiana. -Sometimes, useful tools necessary at this stage are hidden. I'm going -to check if that's the case for your system too, and if so, add those -locations to your PATH. -EOF - # could do more "smart" CHOST deductions here, but brute - # force is most likely as quick, but simpler - [[ -d /usr/sfw/bin ]] \ - && PATH="${PATH}:/usr/sfw/bin" - [[ -d /usr/sfw/i386-sun-solaris${CHOST##*-solaris}/bin ]] \ - && PATH="${PATH}:/usr/sfw/i386-sun-solaris${CHOST##*-solaris}/bin" - [[ -d /usr/sfw/sparc-sun-solaris${CHOST##*-solaris}/bin ]] \ - && PATH="${PATH}:/usr/sfw/sparc-sun-solaris${CHOST##*-solaris}/bin" - # OpenIndiana 151a5 - [[ -d /usr/gnu/bin ]] && PATH="${PATH}:/usr/gnu/bin" - # SmartOS - [[ -d /opt/local/gcc47/bin ]] && PATH="${PATH}:/opt/local/gcc47/bin" - ;; - esac - - # TODO: should we better use cc here? or check both? - if ! type -P gcc > /dev/null ; then - case "${CHOST}" in - *-darwin*) - cat << EOF - -Uh oh... a Mac OS X system, but without compiler. You must have -forgotten to install Xcode tools. If your Mac didn't come with an -install DVD (pre Lion) you can find it in the Mac App Store, or download -the Xcode command line tools from Apple Developer Connection. If you -did get a CD/DVD with your Mac, there is a big chance you can find Xcode -on it, and install it right away. -Please do so, and try me again! -EOF - exit 1 - ;; - *-solaris2.[789]|*-solaris2.10) - cat << EOF - -Yikes! Your Solaris box doesn't come with gcc in /usr/sfw/blabla/bin? -What good is it to me then? I can't find a compiler! I'm afraid -you'll have to find a way to install the Sun FreeWare tools somehow, is -it on the Companion disc perhaps? -See me again when you figured it out. -EOF - exit 1 - ;; - *-solaris*) - SOLARIS_RELEASE=$(head -n1 /etc/release) - if [[ ${SOLARIS_RELEASE} == *"Oracle Solaris"* ]] ; then - cat << EOF -Seems like you have installed Oracle Solaris ${SOLARIS_RELEASE}. -I suppose you have solaris publisher set. If not, use: - pkg set-publisher -p http://pkg.oracle.com/solaris/release -You need to install some necessary packages: - pkg install developer/gcc-45 system/header -In the meanwhile, I'll wait here until you run me again, with a compiler. -EOF - else - cat << EOF - -Sigh. This is OpenSolaris or OpenIndiana? I can't tell the difference -without looking more closely. What I DO know, is that there is no -compiler, at least not where I was just looking, so how do we continue -from here, eh? I just think you didn't install one. I know it can be -tricky on OpenIndiana, for instance, so won't blame you. In case you're -on OpenIndiana, I'll help you a bit. Perform the following as -super-user: - pkg install developer/gnu system/library/math/header-math -In the meanwhile, I'll wait here until you run me again, with a compiler. -EOF - fi - exit 1 - ;; - *) - cat << EOF - -Well, well... let's make this painful situation as short as it can be: -you don't appear to have a compiler around for me to play with. -Since I like your PATH to be as minimal as possible, I threw away -everything you put in it, and started from scratch. Perhaps, the almost -impossible happened that I was wrong in doing so. -Ok, I'll give you a chance. You can now enter what you think is -necessary to add to PATH for me to find a compiler. I start off with -PATH=${PATH} and will add anything you give me here. -EOF - [[ ${TODO} == 'noninteractive' ]] && ans="" || - read -p "Where can I find your compiler? [] " ans - case "${ans}" in - "") - : ;; - *) - PATH="${PATH}:${ans}" - ;; - esac - if ! type -P gcc > /dev/null ; then - cat << EOF - -Are you sure you have a compiler? I didn't find one. I think you -better first go get one, then run me again. -EOF - exit 1 - else - echo - echo "Pfff, ok, it seems you were right. Can we move on now?" - fi - ;; - esac - else - echo - echo "Great! You appear to have a compiler in your PATH" - fi - - echo - local ncpu= - case "${CHOST}" in - *-darwin*) ncpu=$(/usr/sbin/sysctl -n hw.ncpu) ;; - *-freebsd*) ncpu=$(/sbin/sysctl -n hw.ncpu) ;; - *-solaris*) ncpu=$(/usr/sbin/psrinfo | wc -l) ;; - *-linux-gnu*) ncpu=$(cat /proc/cpuinfo | grep processor | wc -l) ;; - *-aix*) ncpu=$(/usr/sbin/bindprocessor -q | cut -d: -f2 | wc -w) ;; - *) ncpu=1 ;; - esac - # get rid of excess spaces (at least Solaris wc does) - ncpu=$((ncpu + 0)) - # Suggest usage of 100% to 60% of the available CPUs in the range - # from 1 to 14. We limit to no more than 8, since we easily flood - # the bus on those heavy-core systems and only slow down in that - # case anyway. - local tcpu=$((ncpu / 2 + 1)) - [[ ${tcpu} -gt 8 ]] && tcpu=8 - cat << EOF - -I did my utmost best, and found that you have ${ncpu} cpu cores. If -this looks wrong to you, you can happily ignore me. Based on the number -of cores you have, I came up with the idea of parallelising compilation -work where possible with ${tcpu} parallel make threads. If you have no -clue what this means, you should go with my excellent default I've -chosen below, really! -EOF - [[ ${TODO} == 'noninteractive' ]] && ans="" || - read -p "How many parallel make jobs do you want? [${tcpu}] " ans - case "${ans}" in - "") - MAKEOPTS="-j${tcpu}" - ;; - *) - if [[ ${ans} -le 0 ]] ; then - echo - echo "You should have entered a non-zero integer number, obviously..." - exit 1 - elif [[ ${ans} -gt ${tcpu} && ${tcpu} -ne 1 ]] ; then - if [[ ${ans} -gt ${ncpu} ]] ; then - cat << EOF - -Want to push it very hard? I already feel sorry for your poor box with -its mere ${ncpu} cpu cores. -EOF - elif [[ $((ans - tcpu)) -gt 1 ]] ; then - cat << EOF - -So you think you can stress your system a bit more than my extremely -well thought out formula suggested you? Hmmpf, I'll take it you know -what you're doing then. -EOF - sleep 1 - echo "(are you?)" - fi - MAKEOPTS="-j${ans}" - fi - ;; - esac - export MAKEOPTS - - #32/64 bits, multilib - local candomultilib=no - local t64 t32 - case "${CHOST}" in - *86*-darwin9|*86*-darwin1[012]) - # PPC/Darwin only works in 32-bits mode, so this is Intel - # only, and only starting from Leopard (10.5, darwin9) - candomultilib=yes - t64=x86_64-${CHOST#*-} - t32=i686-${CHOST#*-} - ;; - *-solaris*) - # Solaris is a true multilib system from as long as it does - # 64-bits, we only need to know if the CPU we use is capable - # of doing 64-bits mode - [[ $(/usr/bin/isainfo | tr ' ' '\n' | wc -l) -ge 2 ]] \ - && candomultilib=yes - if [[ ${CHOST} == sparc* ]] ; then - t64=sparcv9-${CHOST#*-} - t32=sparc-${CHOST#*-} - else - t64=x86_64-${CHOST#*-} - t32=i386-${CHOST#*-} - fi - ;; - # Even though multilib on Linux is often supported in some way, - # it's hardly ever installed by default (it seems) - # Since it's non-trivial to figure out if such system (binary - # packages can report to be multilib, but lack all necessary - # libs) is truely multilib capable, we don't bother here. The - # user can override if he/she is really convinced the system can - # do it. - esac - if [[ ${candomultilib} == yes ]] ; then - cat << EOF - -Your system appears to be a multilib system, that is in fact also -capable of doing multilib right here, right now. Multilib means -something like "being able to run multiple kinds of binaries". The most -interesting kind for you now is 32-bits versus 64-bits binaries. I can -create both a 32-bits as well as a 64-bits Prefix for you, but do you -actually know what I'm talking about here? If not, just accept the -default here. Honestly, you don't want to change it if you can't name -one advantage of 64-bits over 32-bits other than that 64 is a higher -number and when you buy a car or washing machine, you also always choose -the one with the highest number. -EOF - [[ ${TODO} == 'noninteractive' ]] && ans="" || - case "${CHOST}" in - x86_64-*|sparcv9-*) # others can't do multilib, so don't bother - # 64-bits native - read -p "How many bits do you want your Prefix to target? [64] " ans - ;; - *) - # 32-bits native - read -p "How many bits do you want your Prefix to target? [32] " ans - ;; - esac - case "${ans}" in - "") - : ;; - 32) - CHOST=${t32} - ;; - 64) - CHOST=${t64} - ;; - *) - cat << EOF - -${ans}? Yeah Right(tm)! You obviously don't know what you're talking -about, so I'll take the default instead. -EOF - ;; - esac - fi - export CHOST - - # choose EPREFIX, we do this last, since we have to actually write - # to the filesystem here to check that the EPREFIX is sane - cat << EOF - -Each and every Prefix has a home. That is, a place where everything is -supposed to be in. That place must be fully writable by you (duh), but -should also be able to hold some fair amount of data and preferably be -reasonably fast. In terms of space, I advise something around 2GiB -(it's less if you're lucky). I suggest a reasonably fast place because -we're going to compile a lot, and that generates a fair bit of IO. If -some networked filesystem like NFS is the only option for you, then -you're just going to have to wait a fair bit longer. -This place which is your Prefix' home, is often referred to by a -variable called EPREFIX. -EOF - while true ; do - if [[ -z ${EPREFIX} ]] ; then - # Make the default for Mac users a bit more "native feel" - [[ ${CHOST} == *-darwin* ]] \ - && EPREFIX=$HOME/Gentoo \ - || EPREFIX=$HOME/gentoo - fi - echo - [[ ${TODO} == 'noninteractive' ]] && ans=${ROOT} || - read -p "What do you want EPREFIX to be? [$EPREFIX] " ans - case "${ans}" in - "") - : ;; - /*) - EPREFIX=${ans} - ;; - *) - echo - echo "EPREFIX must be an absolute path!" - [[ ${TODO} == 'noninteractive' ]] && exit 1 - EPREFIX= - continue - ;; - esac - if [[ ! -d ${EPREFIX} ]] && ! mkdir -p "${EPREFIX}" ; then - echo - echo "It seems I cannot create ${EPREFIX}." - [[ ${TODO} == 'noninteractive' ]] && exit 1 - echo "I'll forgive you this time, try again." - EPREFIX= - continue - fi - if ! touch "${EPREFIX}"/.canihaswrite >& /dev/null ; then - echo - echo "I cannot write to ${EPREFIX}!" - [[ ${TODO} == 'noninteractive' ]] && exit 1 - echo "You want some fun, but without me? Try another location." - EPREFIX= - continue - fi - # don't really expect this one to fail - rm -f "${EPREFIX}"/.canihaswrite || exit 1 - # location seems ok - break; - done - export EPREFIX - export PATH="$EPREFIX/usr/bin:$EPREFIX/bin:$EPREFIX/tmp/usr/bin:$EPREFIX/tmp/bin:$PATH" - - cat << EOF - -OK! I'm going to give it a try, this is what I have collected sofar: - EPREFIX=${EPREFIX} - CHOST=${CHOST} - PATH=${PATH} - MAKEOPTS=${MAKEOPTS} - -I'm now going to make an awful lot of noise going through a sequence of -stages to make your box as groovy as I am myself, setting up your -Prefix. In short, I'm going to run stage1, stage2, stage3, followed by -emerge -e system. If any of these stages fail, both you and me are in -deep trouble. So let's hope that doesn't happen. -EOF - echo - [[ ${TODO} == 'noninteractive' ]] && ans="" || - read -p "Type here what you want to wish me [luck] " ans - if [[ -n ${ans} && ${ans} != "luck" ]] ; then - echo "Huh? You're not serious, are you?" - sleep 3 - fi - echo - - if ! [[ -x ${EPREFIX}/usr/lib/portage/bin/emerge ]] && ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}/tmp" stage1 ; then - # stage 1 fail - cat << EOF - -I tried running - ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}/tmp" stage1 -but that failed :( I have no clue, really. Please find friendly folks -in #gentoo-prefix on irc.gentoo.org, gentoo-alt@lists.gentoo.org mailing list, -or file a bug at bugs.gentoo.org under Gentoo/Alt, Prefix Support. -Sorry that I have failed you master. I shall now return to my humble cave. -EOF - exit 1 - fi - - if ! [[ -x ${EPREFIX}/usr/lib/portage/bin/emerge ]] && ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage2 ; then - # stage 2 fail - cat << EOF - -Odd! Running - ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage2 -failed! :( I have no clue, really. Please find friendly folks in -#gentoo-prefix on irc.gentoo.org, gentoo-alt@lists.gentoo.org mailing list, or -file a bug at bugs.gentoo.org under Gentoo/Alt, Prefix Support. -I am defeated. I am of no use here any more. -EOF - exit 1 - fi - - # after stage1 and stage2 we should have a bash of our own, which - # is preferably over the host-provided one, because we know it can - # deal with the bash-constructs we use in stage3 and onwards - hash -r - - if ! bash ${BASH_SOURCE[0]} "${EPREFIX}" stage3 ; then - # stage 3 fail - hash -r # previous cat (tmp/usr/bin/cat) may have been removed - cat << EOF - -Hmmmm, I was already afraid of this to happen. Running - $(type -P bash) ${BASH_SOURCE[0]} "${EPREFIX}" stage3 -somewhere failed :( Details might be found in the build log: -EOF - for log in "${EPREFIX}"/var/tmp/portage/*/*/temp/build.log ; do - [[ -e ${log} ]] || continue - echo " ${log}" - done - [[ -e ${log} ]] || echo " (no build logs found?!?)" - cat << EOF -I have no clue, really. Please find friendly folks in #gentoo-prefix on -irc.gentoo.org, gentoo-alt@lists.gentoo.org mailing list, or file a bug -at bugs.gentoo.org under Gentoo/Alt, Prefix Support. This is most -inconvenient, and it crushed my ego. Sorry, I give up. -EOF - exit 1 - fi - hash -r # tmp/* stuff is removed in stage3 - - # Don't confuse Portage with a possibly slightly differing CHOST - unset CHOST - - if ! emerge -e system ; then - # emerge -e system fail - cat << EOF - -Oh yeah, I thought I was almost there, and then this! I did - emerge -e system -and it failed at some point :( Details might be found in the build log: -EOF - for log in "${EPREFIX}"/var/tmp/portage/*/*/temp/build.log ; do - [[ -e ${log} ]] || continue - echo " ${log}" - done - [[ -e ${log} ]] || echo " (no build logs found?!?)" - cat << EOF -I have no clue, really. Please find friendly folks in #gentoo-prefix on -irc.gentoo.org, gentoo-alt@lists.gentoo.org mailing list, or file a bug -at bugs.gentoo.org under Gentoo/Alt, Prefix Support. -You know, I got the feeling you just started to like me, but I guess -that's all gone now. I'll bother you no longer. -EOF - exit 1 - fi - - if ! bash ${BASH_SOURCE[0]} "${EPREFIX}" startscript ; then - # startscript fail? - cat << EOF - -Ok, let's be honest towards each other. If - $(type -P bash) ${BASH_SOURCE[0]} "${EPREFIX}" startscript -fails, then who cheated on who? Either you use an obscure shell, or -your PATH isn't really sane afterall. Despite, I can't really -congratulate you here, you basically made it to the end. -Please find friendly folks in #gentoo-prefix on irc.gentoo.org, -gentoo-alt@lists.gentoo.org mailing list, or file a bug at -bugs.gentoo.org under Gentoo/Alt, Prefix Support. -It's sad we have to leave each other this way. Just an inch away... -EOF - exit 1 - fi - - echo - cat << EOF - -Woah! Everything just worked! Now YOU should run - ${EPREFIX}/startprefix -and enjoy! Thanks for using me, it was a pleasure to work with you. -EOF -} - -## End Functions - -## some vars - -# We do not want stray $TMP, $TMPDIR or $TEMP settings -unset TMP TMPDIR TEMP - -# Try to guess the CHOST if not set. We currently only support guessing -# on a very sloppy base. -if [[ -z ${CHOST} ]]; then - if [[ x$(type -t uname) == "xfile" ]]; then - case `uname -s` in - Linux) - case `uname -m` in - ppc*) - CHOST="`uname -m | sed -e 's/^ppc/powerpc/'`-unknown-linux-gnu" - ;; - powerpc*) - CHOST="`uname -m`-unknown-linux-gnu" - ;; - armv7l) - CHOST=armv7a-hardfloat-linux-gnueabi - ;; - armv5te*) - CHOST=armv5tel-softfloat-linux-gnueabi - ;; - *) - CHOST="`uname -m`-pc-linux-gnu" - ;; - esac - ;; - Darwin) - rev="`uname -r | cut -d'.' -f 1`" - if [[ ${rev} -ge 11 ]] ; then - # Lion and up are 64-bits default (and 64-bits CPUs) - CHOST="x86_64-apple-darwin$rev" - else - CHOST="`uname -p`-apple-darwin$rev" - fi - ;; - SunOS) - case `uname -p` in - i386) - CHOST="i386-pc-solaris`uname -r | sed 's|5|2|'`" - ;; - sparc) - CHOST="sparc-sun-solaris`uname -r | sed 's|5|2|'`" - ;; - esac - ;; - AIX) - # GNU coreutils uname sucks, it doesn't know what - # processor it is using on AIX. We mimick GNU CHOST - # guessing here, instead of what IBM uses itself. - CHOST="`/usr/bin/uname -p`-ibm-aix`oslevel`" - ;; - IRIX|IRIX64) - CHOST="mips-sgi-irix`uname -r`" - ;; - Interix) - case `uname -m` in - x86) CHOST="i586-pc-interix`uname -r`" ;; - *) eerror "Can't deal with interix `uname -m` (yet)" - exit 1 - ;; - esac - ;; - CYGWIN*) - # http://www.cygwin.com/ml/cygwin/2009-02/msg00669.html - case `uname -r` in - 1.7*) - CHOST="`uname -m`-pc-cygwin1.7" - ;; - *) - CHOST="`uname -m`-pc-cygwin" - ;; - esac - ;; - HP-UX) - case `uname -m` in - ia64) HP_ARCH=ia64 ;; - 9000/[678][0-9][0-9]) - if [ ! -x /usr/bin/getconf ]; then - eerror "Need /usr/bin/getconf to determine cpu" - exit 1 - fi - # from config.guess - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - ;; - esac - uname_r=`uname -r` - if [ -z "${HP_ARCH}" ]; then - error "Cannot determine cpu/kernel type" - exit ; - fi - CHOST="${HP_ARCH}-hp-hpux${uname_r#B.}" - unset HP_ARCH uname_r - ;; - FreeBSD) - case `uname -p` in - i386) - CHOST="i386-pc-freebsd`uname -r | sed 's|-.*$||'`" - ;; - amd64) - CHOST="x86_64-pc-freebsd`uname -r | sed 's|-.*$||'`" - ;; - sparc64) - CHOST="sparc64-unknown-freebsd`uname -r | sed 's|-.*$||'`" - ;; - *) - eerror "Sorry, don't know about FreeBSD on `uname -p` yet" - exit 1 - ;; - esac - ;; - NetBSD) - case `uname -p` in - i386) - CHOST="`uname -p`-pc-netbsdelf`uname -r`" - ;; - *) - eerror "Sorry, don't know about NetBSD on `uname -p` yet" - exit 1 - ;; - esac - ;; - OpenBSD) - case `uname -m` in - macppc) - CHOST="powerpc-unknown-openbsd`uname -r`" - ;; - i386) - CHOST="i386-pc-openbsd`uname -r`" - ;; - amd64) - CHOST="x86_64-pc-openbsd`uname -r`" - ;; - *) - eerror "Sorry, don't know about OpenBSD on `uname -m` yet" - exit 1 - ;; - esac - ;; - *) - eerror "Nothing known about platform `uname -s`." - eerror "Please set CHOST appropriately for your system" - eerror "and rerun $0" - exit 1 - ;; - esac - fi -fi - -# Now based on the CHOST set some required variables. Doing it here -# allows for user set CHOST still to result in the appropriate variables -# being set. -case ${CHOST} in - *-*-solaris*) - if type -P gmake > /dev/null ; then - MAKE=gmake - else - MAKE=make - fi - ;; - *-sgi-irix*) - MAKE=gmake - ;; - *-aix*) - MAKE=make - # We do run in bash here, no? It is ways faster than /bin/sh. - : ${CONFIG_SHELL:=${BASH}} - ;; - *) - MAKE=make - ;; -esac - -# deal with a problem on OSX with Python's locales -case ${CHOST}:${LC_ALL}:${LANG} in - *-darwin*:UTF-8:*|*-darwin*:*:UTF-8) - eerror "Your LC_ALL and/or LANG is set to 'UTF-8'." - eerror "This setting is known to cause trouble with Python. Please run" - case ${SHELL} in - */tcsh|*/csh) - eerror " setenv LC_ALL en_US.UTF-8" - eerror " setenv LANG en_US.UTF-8" - eerror "and make it permanent by adding it to your ~/.${SHELL##*/}rc" - exit 1 - ;; - *) - eerror " export LC_ALL=en_US.UTF-8" - eerror " export LANG=en_US.UTF-8" - eerror "and make it permanent by adding it to your ~/.profile" - exit 1 - ;; - esac - ;; -esac - -# Just guessing a prefix is kind of scary. Hence, to make it a bit less -# scary, we force the user to give the prefix location here. This also -# makes the script a bit less dangerous as it will die when just run to -# "see what happens". -if [[ -n $1 && -z $2 ]] ; then - echo "usage: $0 [<prefix-path> <action>]" - echo - echo "Either you give no argument and I'll ask you interactively, or" - echo "you need to give both the path offset for your Gentoo prefixed" - echo "portage installation, and the action I should do there, e.g." - echo " $0 $HOME/prefix <action>" - echo - echo "See the source of this script for which actions exist." - echo - echo "$0: insufficient number of arguments" 1>&2 - exit 1 -elif [[ -z $1 ]] ; then - bootstrap_interactive - exit 0 -fi - -ROOT="$1" - -case $ROOT in - chost.guess) - # undocumented feature that sort of is our own config.guess, if - # CHOST was unset, it now contains the guessed CHOST - echo "$CHOST" - exit 0 - ;; - /*) ;; - *) - echo "Your path offset needs to be absolute!" 1>&2 - exit 1 - ;; -esac - -CXXFLAGS="${CXXFLAGS:-${CFLAGS}}" -PORTDIR=${PORTDIR:-"${ROOT}/usr/portage"} -PORTDIR_RAP=${PORTDIR_RAP:-"${ROOT}/usr/local/portage"} -DISTDIR=${DISTDIR:-"${PORTDIR}/distfiles"} -PORTAGE_TMPDIR=${ROOT}/var/tmp -DISTFILES_URL="http://dev.gentoo.org/~grobian/distfiles" -SNAPSHOT_URL="http://prefix.gentooexperimental.org/snapshots" -GNU_URL=${GNU_URL:="http://ftp.gnu.org/gnu"} -GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org"} -GCC_APPLE_URL="http://www.opensource.apple.com/darwinsource/tarballs/other" - -export MAKE CONFIG_SHELL - - -einfo "Bootstrapping Gentoo prefixed portage installation using" -einfo "host: ${CHOST}" -einfo "prefix: ${ROOT}" - -TODO=${2} -if [[ ${TODO} != "noninteractive" && $(type -t bootstrap_${TODO}) != "function" ]]; -then - eerror "bootstrap target ${TODO} unknown" - exit 1 -fi - -if [[ -n ${LD_LIBARY_PATH} || -n ${DYLD_LIBRARY_PATH} ]] ; then - eerror "EEEEEK! You have LD_LIBRARY_PATH or DYLD_LIBRARY_PATH set" - eerror "in your environment. This is a guarantee for TROUBLE." - eerror "Cowardly refusing to operate any further this way!" - exit 1 -fi - -if [[ -n ${PKG_CONFIG_PATH} ]] ; then - eerror "YUK! You have PKG_CONFIG_PATH set in your environment." - eerror "This is a guarantee for TROUBLE." - eerror "Cowardly refusing to operate any further this way!" - exit 1 -fi - -einfo "ready to bootstrap ${TODO}" -# bootstrap_interactive proceeds with guessed defaults when TODO=noninteractive -bootstrap_${TODO#non} || exit 1 diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest deleted file mode 100644 index 3cd8fc6..0000000 --- a/sys-devel/llvm/Manifest +++ /dev/null @@ -1,87 +0,0 @@ -AUX cl-patches/0001-r600-Add-some-intrinsic-definitions.patch 2450 SHA256 b0a718800c8969e174f3a22e61c15a370376f477e031fe97fff6aaab152f9867 SHA512 d23f9645d3e3364b1e9ce522eb15022fd3f2a685741db88b117b409ee33a07344a8e9ba9d89dc3535e5289edf79c6beb7ff144659f4e725b1a8f2c4256f9aad0 WHIRLPOOL c549806dbe5309dc441b65c942de488c6afc8c511d060d5c1459a4f99b97a357acbec51ce51bd704e5e1e74437cd413755f15377ad6b96c235242bc370af096f -AUX cl-patches/0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch 1189 SHA256 172bbb3cb1214e61ee2684c133317bb997e94a34c91dae94d4848cbd0c216436 SHA512 cf711149c421b4258bc64b81018d0a9474d8b4e4128d0cc0cea788b54c93e9512397b2310db8a1834c3507b4d893d5743dbc53183ac0daca23da55601b976c16 WHIRLPOOL 8e6bd9f005a6a941c55d7c8d9b127826191944fab9e404f8ed958efd07017f5f9301273739f869a73f15fc2a79af9dc18687ff85403acf24e175a464838b3f2e -AUX clang-3.1-gentoo-runtime-gcc-detection-v3.patch 1457 SHA256 f4b22281d21e39bc4681519cec90243c0e50262ce56ae68b0a8d9e7d92ce0375 SHA512 81c582791f4b0b1ccfcf3e8c82fbb68312320c5287402236d8c6d2d76767bbba031094c26d2b7bd9581c473896b78dda5a6284c5a87726e1bc0c539ae9294763 WHIRLPOOL bb68797804c89f8797561964697a72a015daf2c951d92f490f8c83f38aac6f50ce1527f39b53ccc6a3d93f84ec8f868e40340a5472b9e7ee4c34ceaa4b9ca845 -AUX clang-3.3-gcc-header-path.patch 4309 SHA256 56e51c30b91f0ff264c27e332c5375672c035b8271a64860b9e940c918ebf7ac SHA512 568c82c34b56bd18e34122975a420f38ae9f190c9efec00383aa0802c1810297b1fef94a21093775ee20c4b30ad5800b4bbebd26e5cbc9358b11ce7b5165ac41 WHIRLPOOL 2ea6ba49110d6f0bb1f3c6f93f6788463cfcf67b19d9397a69ab4066d3fc1106d544bedc24668a5e515df561e992a7d59a27253a08fae02e622aad36962ace8f -AUX clang-3.3-gentoo-install.patch 2815 SHA256 76a3ce245b1fb9cc5d391934755d27e248bdcbb9581ab7931287e75bf626aad5 SHA512 8105461ff031a7dc00e2a8ca9939afb56525bdc065beff7bb06f22525cb6ecf6b8196a1e0ac11fa3895dc29b4f04c24f61c5492859f23785285517775f3d69b6 WHIRLPOOL dbb5fc2596bee19ec9fff0c14b4a9e087a6ba4e3af115da956c43772cf44f2f480a21f86b15ec3890d74cc3fa3b9cb4e3bdbee341677fb8e79a640b0a5c8f6fa -AUX clang-3.4-darwin_build_fix.patch 1876 SHA256 b2fe85911006affc8ac5fc68496c45845872cf4b37445910b8d10a5bfbe77fcc SHA512 54841b590e14b84f90b00ec782785181018196d076764e4048960d1321d18aac388e1220bdc70b10432dfb5fcad5a43af6c33124ec93df8bc3a724cceeee9260 WHIRLPOOL 8c1373a558619be095427d7986246524e5f7c1239ee706234debc2add1f03626d630a1e5216bdc7127f0b833eca791fae666765a27d394ecc55d394492f424ab -AUX clang-3.4-darwin_prefix-include-paths.patch 714 SHA256 a1e3f34d225e4b0503fa2bccb85e53e80f682a3171ec726629749f7fe7e725ed SHA512 00a364352cfeb6c18f825045af21c3de9d501403b416fba2380dff0e3bed957ec42cda35ca13b718fe3854c26264578ecf4beb295a374d5afcd620b87dc44cea WHIRLPOOL 816c6377c8a17dadf91380c19dbf337d1f5e71733da6f2e1f79714a2fbeee8f37ad6f0ad1bb449061771d317b8bada044fdfe22197f6c3de2ec2708c9cdaac09 -AUX clang-3.4-gentoo-install.patch 3228 SHA256 051799f114102aa46717dc4a7224c878f7511b69a06090c501abe157c6025c5d SHA512 35127c66182ee1f698bf96731c11679c3fe162d9dcb524c06467598b374fcce94dd0484723acc0072ab1565c581e2fc74d6b7246484bfd9bf1511eb419a85c9b WHIRLPOOL 3d1644da31e9278bf0983bcaf1947b99570e71366b6cc868020c5978037795c27ae211c4d32562dfc1933ff2a4e9f8c0aab0248ac9c6c69fc954a830502d3f68 -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 clang-3.6-fbsd-gcc49.patch 1016 SHA256 550862df82d47bd54e8adad7b8ee5bc8eaf14ed4bc100d09ba01d5416ac624b5 SHA512 4d9fcb9626774ea1a06494ee55efb5d6232a33874996a90fa29003ac53f9b9dad2885281a9f9bc15fdf0f0817c351cb6d8a4151e5f6ea12e28d383ded1429018 WHIRLPOOL c0140413a4944989efc5ef9c6ba33d10f43add5e1d8c7a8438cb04c18e764c3db26d65330d6a1570940a93cf4d43de6bb1f5a5640384faed3ea43abfa52b3d5d -AUX clang-3.6-gentoo-install.patch 1660 SHA256 74cce23945897ce2cfd3931b08695d534973e32a0d104ff942b2f5c500ec4ad7 SHA512 77e2a2dd82fd13292edced8c9bba911579f2b4984a64223e8c80f41b5605220f1433beb6f40e0746163d894d4405296e1f40584eb069f960866df97e6057b569 WHIRLPOOL 4784e8da4e04406a1261c9a539280c90936141b6061e567c70f9e4b566d45e0275b2513d66c03a5473fee6f434e0cf0242e7ac21eafe59a8c26c7c6bf7040876 -AUX clang-3.7-strip_doc_refs.patch 2213 SHA256 5b1e7cc9264d55d3c8213cbf4c6701ad01652da1159ba0bf620cbe7a3382cfdd SHA512 dbe382a64e01c148b6e33734c1b423148584a15037c651cc56691146a1419559006a605c9bfb4ae72d23702ea48f1f40903bd0faf95c1d0ac3c8bd68c4238cdf WHIRLPOOL 5c884f67413af976f1146a2705c1096a7425ca90d13686b9f71f2230447ebe1d1bd39a93e32ef01b4ec6178fbd199b05bcf8d0a6780637914f3bac86955409c3 -AUX clang-3.8-compiler-rt-fbsd.patch 1101 SHA256 1490f7343a7ba632057e7e38e5885b5f2a0c212243673bf06e0ffa5eeac69253 SHA512 f1c23ce15090e2c75f43796dbdb0fef113f55aa633aebf041ab894638221f13dea195409063db663033cfef8963793b2578e16c42b8237bc342107e6d73f22dc WHIRLPOOL bc8b078dca18c5b31abbd45b08b4e17383a007620f730a5331ab7e6dd5d937686d3875589375cfb7280d18e5d327c86fcf9e8cf82f25f91ffa1b9779e8822df5 -AUX clang-3.8-gcc4.9-search-path.patch 4800 SHA256 bc0d359d971811a1d4fdf4444e72987f7defcc5309af48f2410a410d6e781625 SHA512 8104fe788344718a68e65db5bdee1ba317c6fb9c0c5fab255b6987790e0c4ac6e24abbe10d6ac340176fa4b726cc38c3e8bd282fc993e2155fa96aa98a72e4be WHIRLPOOL b43138f34f3dff9a1841d6476abb312471dda5dfa58732a4cedcbe1a5df576aac5617d44e58202d32c8b11498a8cc1da1913487b866d18556bde93cc7566e7c5 -AUX cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch 1404 SHA256 c9692562264ee6a25c3a2f25c990fab763aee36014de3ef95aa1d35a89aa0c0b SHA512 41dfe489adc0a45e4ffd5961c973fe94934d542b1474bb2dba4320b75ed6ff22ce0ac4b590ff20e626ea7c14617c9703ce1fd4d8d6bf1bd3b26ab0adeea373f0 WHIRLPOOL a9d84dc513118cab6310ea46c7b2e67654c81cd3c783d5db8e9ea3657fc1658e80fe4663399d4e35f99294ea9a98fb422e9077a6c8b73a3a98bbc8b282d1e9ad -AUX cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch 954 SHA256 6518c1a1fdce0371aa1a9dab790c0999440e7971ab2613f6d348250ace9310d2 SHA512 e4721c13add5f65126a3d84b9b66ce7086f435c9d2a729edca7bfc3c6f185afb2b5422c7f5045c1a3a4f82c5e3d5616b647bfad9975bb73ecf228235f1d9f588 WHIRLPOOL f35f09b2d29de42dba9c28825af5feec562860f25206589b0a9dcd1daea27c317da1385bdaa5c562b2f4c0613071c3bc1fbfcddece97cd13debaddd14324d552 -AUX cmake/0004-cmake-Do-not-install-libgtest.patch 835 SHA256 ed1531681603507fc674babd1f117063dcceb856151c20fd967d667d0dd83f2d SHA512 156f3b56e1bfe17804d3543a109567dcc10bac7a77f440d97bb900cc61f1e7bfe195ea3cf97bffbae7b132ebe31ad9d1acf5aca462a4aa01575909971ffdcf06 WHIRLPOOL d8bdc2032cec631c89d77a8fd231a0c22eeb5f9c99b8fda1068fb0e9fc10c81dc2d1bc71e8254ebea6392cfe3700427879841f7a6fcca3cd4c72ec1f1cdd56b0 -AUX cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch 1689 SHA256 255e8cf326d5c7ba04cb24d3227cd9d53cc37de1c191c001a0b44973e916b366 SHA512 755ade61097cf2fbc0f480476d81f17f29a32346b108c93f7b918b606cc1d8b54b06d78fc4dddffdccfab9c7429e4be7232fb8f4a498d239a8524d48e545b102 WHIRLPOOL d03f81f0322e006211e706f4ac87b9a47de31d464017de10fff636a62418bb34835f641ec872b8d599611fb2e61847c71820f60ec186f5fb4444e2b73f687860 -AUX cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch 2251 SHA256 eb5c750e910b8088ec7e7fe2fa1cf367f4db738dbe681fa41c35e989db312c3b SHA512 6fc2a0a8d0b015c852f2ee2ca8038da0e64d7388f8909f52e871bcf0a25e8b5ac2a0a163411e83c24a71445a8e84d9ac9cc6acea543fd407ac8a46eb4ca13c0f WHIRLPOOL e193fe49bfe4657caa08deda88d8d5ec9270a9cbdeb9a08279efe9571a19ff2dbcd6e5eedb8ddc473a763ae60eebf7a38bc3366959569b78a9e15c46f2f4d360 -AUX cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch 1031 SHA256 a0da8be64c575ec5a353ee33c530569c754df65cf6df04e5abbc29bcda1fccca SHA512 1948de3e7fb38517e00909f285541bcf3d75cb9c51ce7a2dfb7485346dd3409200bf82081a3a83d7e6843fb4cdbac12395ac6b9049f45201c94fc0ffa09d1ad9 WHIRLPOOL 8282dace8d2ba9d111b57b68e0116e92cafe2c070cc82d52518c6a6b4be3dcd37882bb505fcb3b01817eb577261c4f7f1b152bb12def6be52ea9c1625a15c29a -AUX cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch 1106 SHA256 010816607be72e178c21f7b5b8fbe2e70697feb70c4d78e03b498672bff1cc5c SHA512 0081071254eebfa2f550b98290b661664c31ce5e28222d491d9f3522c4822878b50ba6f08c24e1a3f97cc9b1d437e76d50fb94939e37432d048e22825068936a WHIRLPOOL 38f09fcc2db0453974b76c12ca287718d778153496e6fe9237b92026bd6dcddf96dde69c5e406781c9da90fcb0de39327e1c4cb8ab847935e2626697e3acc9f7 -AUX cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch 884 SHA256 40978b278a93f26f21b1639d962cd75290051fe1a3e1ae52c3de98631e6b0b6c SHA512 10b8280ffa720b4de42bb95a7d504d1f11d386544614b1281575b4864749be659d6700cdbe3f2cbf5f85a4ff2dfeeda752955e37735214b8a1fd78e3e5b306e5 WHIRLPOOL 3a3a5cdb58a22fe311c62db4c73c058522ad027704e44a93b961f3f0ae11c9e230548cd860db4163eacbcb46b8e6580f9ad4c3db85cbca2d5495495076c2a37c -AUX cmake/llvm-3.7.0-lldb_tinfo.patch 457 SHA256 7347b1e266883cb3c287cef5e5070239519a91a6e11481fe81ba291dcba2dc7f SHA512 74ca80d75e366b9c940f5955cfe9fab22e5ab7ca574971159166b3e7b73eba59db7967db4955a951157eed2d67c2189ea1bd7faddab1878c6b8e206e65ecdc18 WHIRLPOOL a3da347ccdd9561ff9327c2025f5da063b5411ad2d12540ecf452d4af7e2c6f635e935cf70024f8c76874b2c1b2161c01be41970c9dbc6a52bb919ff8e5108df -AUX cmake/llvm-3.7.0-ocaml-build_doc.patch 470 SHA256 8b163cb18d7fc954f3d9c1b51470f1e94d6a5361a241736362af845976e9b025 SHA512 fb15a267d6b2febf87cd200d5b7e0f7c1371b6219398c49ad033f2b695b2a0a5c092b92ddee41a1831682f90b17af8c8bf01e261c99f18f654e007dd2198b5c5 WHIRLPOOL 31e772ff5574a5c05e598140586a4666824d5a294d09c721b8b20f15b9493182d90a8ea301959bb76f4280817928a1518e8223f018f93ca6ce125f4f7be941ee -AUX cmake/llvm-3.7.0-ocaml-multilib.patch 1883 SHA256 90a61205f73647d4dbf5eb7f8543d281a5fbc87e6742a60ac5ee2a5d384dff2d SHA512 74d09ad5d20f2306d669b2bf115f36fb8c9d9dd0888a9cd6e08bc6e55d47f1f742ff72c866d5c89bd065500c354745dc038df67838a7cf4bda6daf41d803f5af WHIRLPOOL 20be3b94ddd745f640a48eed3ba9ce8d91df44d4ee9820db824030e46dfaa44ab39107cfeb08a91f54898e7b85b1e4ffb912efd4f844b9b221c1ac3706d7f0ed -AUX cmake/llvm-3.8-allow_custom_cmake_build_types.patch 563 SHA256 e2e8b2bce270eb2bf5edfa67bcec9cbff114a9f4cacbaad8d66f998b5d8b9a2f SHA512 bd3e5ebd4be947f561da8d19ebf50a31d2dcfdb2ab0080fdcf514f02ea23d411643bf5556d1d788d7f53c71b6503f457e9f6a68c82f0650a86e4b0ddc4aaa9b9 WHIRLPOOL 65ce41d820b969a0596655fe6f7e55edcb4fd16972c4608c9c2ad7ae522d2c522009b2af430185c08a007a34908470e058dae5d1b084eac1c6db2ba39e0d08e1 -AUX cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch 1210 SHA256 ae5896f281c9e5e3ca00c962fee38cb6c95e3034f60a79a4befecc16c7bfee6f SHA512 b07b1b54fc8ad6141d6fd3335def6c70588dcbf90f81a538238cda70bb7c0acaae4d73f75c8d5f7c42b4c9c687ea2feebd3199606b22635a52a402e2fce4ce9b WHIRLPOOL 246f126c5c5d72e9698fa510f9d19930d860cca017b1588ece4cdbbbdf41d021f5d28fd2ef3b9653707f112a329d0b6eed6ce1b4630e84a2d9d539e3bf7fc628 -AUX compiler-rt-3.7-msan-fix.patch 4235 SHA256 c5adcf512970eed4b0dbcc4ab59277702e3c366d6474b994e1d4d4b649e725f0 SHA512 85ac871906d94bdff736e6c9be71f785da48dafa7bebb9bb60507742dfd59e1f9429aa5414ee913e38dcf1712d0cffc3d48dda78b794ce0b4417511b02d4d5e4 WHIRLPOOL 050abc3a808ad6eb90488516af837a82647053018f17738557d1864be0949a47f40f6b2d93bbebb18408e9e40b712d7c9fe67a3160faf65bc99822f2b141fafb -AUX llvm-2.6-commandguide-nops.patch 975 SHA256 0e36fb43e020fa380230a8c6f2a79b9a19e12e857e833ef856e2b41aaa283649 SHA512 6842285e499b86581ca12fd94f5335e0dcd7afcaf0cdc5042ee8d84d0da6aba6659652eb639027bcad7caf77b0c994ac7e181a15bc609c4b3882e0f391c8cd33 WHIRLPOOL bf1212a8fd06214dba0916a73266842558bed740220d68e3447701ffeba1b3020ca4b4ab5c6d57772a60a6e09f153232f680b1e0b11cbd5d430bd9ef693d2926 -AUX llvm-2.7-nodoctargz.patch 1878 SHA256 983657329ebede731b397ba0256d729b3958f39faea64c9f7d065ab8d2a3e7fd SHA512 3f9dd34437c6dba8246cdf5c8563889f805f3c8e579190c4f0fb06f72bf5aa112ecbfa18467a35eceaadcd470544f434f319f048cb58d6631170788b10fcc75b WHIRLPOOL 63182867bf8f0bd6ca1b7d97229fd13952526d59587192727348026e8a759f1c6b79db044760465e2424851fdbdf79e4122c5bb0285b505d20f151334063e8d1 -AUX llvm-2.8-alignof.patch 2522 SHA256 a9f7add4f4002bf9af438c0c4d1ca86875d6214a5044334325a60cdcbc8a3cdc SHA512 188bdf29b60ce0f83010ef33cd28c4cb710d238fe678be731ce1d099c7df5577f51162c95e06d996e9c90535ace41fecd3eff6570214a313fe165c0945c42832 WHIRLPOOL 65dd1cf8eb106af0516a5f302a08c51bfa884e35dd5efffbbcf97e1212a6b9356c6caea4472dce8e54a5a30dc5c6ba73be29e64b1b060e63a9ce7d816066ccea -AUX llvm-2.8-darwin8.patch 576 SHA256 6db04d9bb5fe65f8a92972988477328a7358e325abca32f30a716ff454d0fe21 SHA512 a7716ade819779bc2b8922cb6b072b85c0edef95cdc85b3b6dca18a51c7d4c48b4a8428341c2de85ac6fb0045849feada36f610a6e706eb80dfe64bb4e414d3f WHIRLPOOL 86dae6d234a8d93dd2714a9cd8ea45f7749cf1993d003da1c3a9a15cbc6e44603cd9b364a5095c5e7fb2df899d418bca29e1b50aad5ecc66829b944dff9d5488 -AUX llvm-2.9-Operator.h-c++0x.patch 2062 SHA256 1c37346b0f412556dc979fd510585f3e20d2d45319ec095dbdec37a582d590c7 SHA512 215214df015c87efa92f8896b9239e5d7385edae1f637bd837584f21a919b9be15f0608274242172c684905f080685e8de770fc16c54c42bed416e6c8e94d2de WHIRLPOOL df4a1ee6d150f95add3a6f33f5b9648dde89ace1012702e88ce5337748a0e1f826073b1b034def46e1971bc1fa5c1841d1dc2eafbf5b428803cd0d5f80c4594d -AUX llvm-2.9-gcc4.7.patch 542 SHA256 9472566d91344ce87e235c68e4e08786c493cddb3383f2bd2f0bd5a1ef153cf6 SHA512 6011f0cd56dffb068342b0f272898218a751f077a970cca34ceaf6e3b43b0c1e7440eed1a73b925e91d0ce0090beba4d8935496449e84609123388860f92d0a5 WHIRLPOOL 4d9a8154fb0f7e2cb1498e8fa010be6f586736180bd46fe54e9b148d1a0f7ce52e4772d17a7481e45490a12dc2c10f5e6a1a7b886914206a5d3102e174cf5240 -AUX llvm-2.9-nodoctargz.patch 1569 SHA256 62f1b080364d94e528bb34f0063562d16a59395aa7f97277bba88fbd93e00b84 SHA512 3a995897f25bfb97908bd8a379249a7b04dc0d8b64aef693272b87c88eff3494d5eac0a66c786e0cc1b8d4fc6b2c555ff8d09bbcd2e29c5e6f3bfbbdeba79044 WHIRLPOOL 254f121f0a5a1974600b1240074f9f8f9bfa760e5bf34f27697c27cf65646e412279b3c523dc3ee88305f73747881c20f60258dbd90bc6a2c380dcc3000ba329 -AUX llvm-3.0-PPCCompilationCallbackC_static.patch 1046 SHA256 f197920fb1ffbebeb2f43689619d637c5102bfc73295a8edb139cca46094ec5b SHA512 29a46adf9c2205475e2fd74ce15a3094b43905f28c484961ad81c78f54e3c4d56fb4005080db7e9671654738fa25901d5bbd1f0a6ae861a5e9b6d38053a6a65e WHIRLPOOL 8ba25aca05b21e2a8a6e25f5c07aa46175b03a4233e6fe102c619b7c60d5558d28e80dbc9c0892a1ecda1e2effd50211cc145c8389e644a27282cd108671e2a7 -AUX llvm-3.0-PPC_macro.patch 1825 SHA256 e56947d9744549ef6903238653c6569b5f91a1eb1bd84ec5d69d32ce5b20d6e4 SHA512 552a6a980cb2c05b6c6924d234efdcf375d12e72829a0372d3a4754d6bfa54f022d98e08b6f286d7dd496f2e74e4f6f9e5f81994a9d183cc39a4a01170b2c57e WHIRLPOOL f40fc9c6d75d7c05c66271c74011c320e302a0502970c38312cbf57a75f06a291900e62a09e3127d0dba7f0569a89d1e35225ca4e2e2b702063c0fb4f05878f6 -AUX llvm-3.0-gold_LTO_link.patch 442 SHA256 62dc70a1d1f581b7f768ca728dcca688a741e03e64566d5f38e02e33c6372ab8 SHA512 6daf346d5fb93cb9ed498164ef42c2c565e6e4e68bd820fed54f53afea4b1a580560836cf484e370a1566603d8799c0f359f589ea99b9d920bc587145391a65c WHIRLPOOL afc7dceed1de3db657f45ec58fb6befd9ec9e79e6c55dc3fcbc26e19c5e0b9d9c0980476a34e4dabf800465a6fe57897ddc4aa1b1a1d88a639126e262bedda62 -AUX llvm-3.0-ocaml_install.patch 664 SHA256 6f451130ed8fcced98691361d33d4d44d8866e703673c293cf7f88af8362e694 SHA512 b13e26a979505df40519ec6fd859f46e3a0e8589ed29c8509ca5c737af1e94890fea2f7c7a0b95ef168dfc7993b52133d7205de228fc4b750fd84af1ee2735e8 WHIRLPOOL a5d455a5671ec1804a06849588c072c29718d5c8218c6ba4a6b7de0b7dac0ad3d37007ed8b39447545bdf917b4c8e5fa780477a28c6250b47692605be7239b02 -AUX llvm-3.0-set_soname.patch 522 SHA256 0f4fe63baa74a963929dc39359cccb6eb4fba73176d72d4a354ebf50e51318a5 SHA512 ddf1b5572d51b5af66d5d7ef28798b41a2991c1799ba091c9e6f3a64a6b1b8081d596096919c7c910ad5af0adc0c8ad02b23fba30eead994d724a334d2c9da9e WHIRLPOOL 51aa3f1dd35e085fa4d3fe700503cd348b9342ef1d7164ec3ef2627b8ed8df0764442779315720c6cd301e4c099722cf84b305717129a386fd2792751e0c20ed -AUX llvm-3.1-ExecutionEngine_tests_xfail_arm.patch 1357 SHA256 392a5e752623a9e019106943e7977f4ba96159e4d5f45208d99ebaa5ddc340a4 SHA512 088dbadb4d27fd9317f9df077527790a817c64eff0b3c27e24a09bb35c00e3138d85d6aaf65e7dc749a120efc639e6ac8c4fbe74af73f3f0e4664fc254273854 WHIRLPOOL dea2a2ee142803fc4cc598fd75351679d761acd9e2c5153428791e0f7548b0aec0d63066f1454987fa6bc712107a6390272cceb03580808408229f6051dcbbde -AUX llvm-3.1-docs-pod-markup-fixes.patch 819 SHA256 c15d4ec435b7b9e37157d0c766ceeeb9b1c650328acd1eee0e588b5272f9ace0 SHA512 b6d8dcdd2003060ab486a8cd4de7b36594641c15074f0642ed2db1f58cd4b55e327a5bfcd6344a7d987ee38f2b4f5ce79941f5658a6fbbcf851172991ef4b883 WHIRLPOOL c37650b8584698379efa5b76e2c02b4bfb30d086d5729754ea668ca8e7cf99a07d795bde132085a89cc926f966a97f68c0094313ed6d895040d429ccd7923fc1 -AUX llvm-3.1-fix_debug_line_info.patch 2620 SHA256 db1f1aadebbc4c4232bdad49fb9b7dc61eac727085c63154b870fa9ce64fd18d SHA512 0b8bdde081dc7eddcc3556a0220f0a47565c6b95afb31560a835abe630d641c43e3acd0f0d0ba177809495f3208c17aa1a0fd267da3a34d71039c846b03253e8 WHIRLPOOL 47decb374e7109cee7eca7ccfcae5a2bd01a837d9daf6d201f20eb0d2ded14a66e737532c033ca128b049557cd0977dee811a4c54c15036e050d7383c586b5bd -AUX llvm-3.1-ivybridge_support.patch 405 SHA256 cc91a69be3d0f7f216a4d0484284fd054d4b0273f1c4dda7afcc005564867725 SHA512 7ec84a127eda4cbec0aaeb1e34f0606ff76e070bf1f3eb71334219b6a2e21299f30f157d022952e6f23c5e4180903239f5a4323f214041decd4ccc21f1a285d7 WHIRLPOOL 443c57305f1c9676e7191042c0ab7491a2a789433e32b5cc12050cece38eebe9ae62fd1d54200fbc32d2c7d22aedc7f6776fd250ae53e7d2afad0a325c1ba919 -AUX llvm-3.2-nodoctargz.patch 1761 SHA256 e17494aef638d2fe3fb0b669516ffcc9e560161903e1e165de0eecba684c8c1b SHA512 d12a8996d8a1160f7bad4ce3b3a9ddfb2d29d91fc160876c145f9241927b0cf4413f3b29bc2bf291f0421f61a512de8057e8f3d0029a8a09ba3f1d93582723b5 WHIRLPOOL be273271db8293829a63120cfc917711c99d8893cae6f95af2583def735131f629ee67b5a1515df007477f34abeaf5f2729d689eefdc61eb3aae6b1959971507 -AUX llvm-3.3-R600_debug.patch 909 SHA256 84ebe63a557e3734dc8ed4545f098e2496d815e6bf4a99dfcb65d649a23d2c1b SHA512 cd1b92c713edf895ab7a15494c6092e44082b40b9bb5b0fdfdc438e919456c7fcafab9a840adb165c191454948c0b42bc78ce2b4d2cfbdf371917b16351c6928 WHIRLPOOL 0f08c58c78c1d04b8e701b0b817956a37271115c1fc83ea8f0f54bf965fbc659e418abf7f429c2a29581351050346cb783f0aa9147757d4cfdfa24fd8b28d09e -AUX llvm-3.3-cmake-modulepath.patch 916 SHA256 9d0a00b543c4db58cc65bcf82bafd0aba4747c559f19fd96af1b52a3781f75d0 SHA512 610d1397d35e6502b4b7699399d41585724845f93dc88cfff8104318570b29ce25f99575298d3263440ba57859ed9792b1fed951ab4bd30ef5e1e1c3ec4898f9 WHIRLPOOL 808aa0c3b744c0c3c942cbede312ac8ec2af7404362e4bf8fd0d408e9ffaff90453787816575dcd6a1cacd406818aac5618b2bc5b5a2b4b3817a1025295f264f -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.3-r2-gentoo-install.patch 4043 SHA256 a8e24328888dc0459fb5c24e244c30baf7f8ec75875fc7293f9e1029d75fb1f2 SHA512 f829d9f8e0d5730a8221a8be9a1d87c7c79a09f498f00d5f9cb7d1172dcdcb2ba1b68b8b5454225dde230d642240d0f647439f34befa23b64156b2f7c2247027 WHIRLPOOL e937127359c474bb843cef34116d2ca8651c4d22ef7ebfc8cd2a22537e483cfdad7e78c1fc4a7d4bee92fa19995bdab9dc8b7cd96594f114ddc9a6af4604ac63 -AUX llvm-3.4-cmake-configparser.patch 1182 SHA256 b5d61e4882e301b361321c3bc69cdee6398b97bbb86ab3895879def6e18907bd SHA512 06e792016a6d7d091a5e15f8a13678e3e59e87bef591f9340ef427c820d0112cc22b7bc9ec57c7066da7f9bca3841a558bd98c71aa7df2aa2da75e53260a5347 WHIRLPOOL 8326541d632a6d4abf8d6444384932a395b6640d8b7f91c8ab29ae9acdd11922acd7652a9e211e5ad704016744d980d0087dbab30b09cab62e160ceed2236936 -AUX llvm-3.4-fix_varargs.patch 6427 SHA256 b764d5c8e2c25aa2634834522aed973ea6ef367d65eb7bed6fca19255af80f82 SHA512 cede7ea9aec7d27dd2ad4a41eb79cf566a03c9384a0fe1b07b52bc470d97a0a54735f5e09ee78cbf2323f28bb3f191e30a6f7454967975791cd70b96e09538d4 WHIRLPOOL a238ba38b5ea13ce7a2d96d4ca2853ff563988b439e4b8dbf99fb6789d46b260469190c7ffe11d5012ca2cb77a8c2be6a95722a3df2aed841938179b219cb6e0 -AUX llvm-3.4-gentoo-install.patch 3528 SHA256 fa2de6dd186091b255832a9b5cb654edddd4c4a16f0f138357c813a40aa9a75b SHA512 e946e1fd422f49d2e150bd641bac0ffe6ea6757b2e6119465090a3c7f5cf69e17c00221bcf67a7fcf29628d93463fb1c57d0d009ff7834151440d779f2d33484 WHIRLPOOL 171f167802ee289716232e16a2c507e3b8dc7913b40df29c55a815ff88596871a1a970c891b0e9b361186cada4d8898e65920d014b4e6eb2178cc207f61bf6da -AUX llvm-3.5-gcc-4.9.patch 1722 SHA256 c73f64311ff67534b581729b3ef0fecf452b86961c3b668ac2e6b50f1eff0bd2 SHA512 5ad0a742fca3eb9e08a183af9f90370baf85528bba6f3083d19592fe2a704950ca8c6bf9e930f9834255de3fc5832c49a06c9ca29a66e45928d9047abd9ad8ac WHIRLPOOL dac24fcb47d8b094ffa6b4403dbd7604901dd0f5ef6665a882380109584e4de815b2f277e05d44c05e1a3d22a7003075b2b2649f3f614f299b38bc6d594400ae -AUX llvm-3.5-gentoo-install.patch 3204 SHA256 0c97173613505ea92f0aa79d4e04e797f1917fdc33b34daee05752bb52336d53 SHA512 f60b04f1fc7798f7869f3d80e4c163086c398e01b81220d60ccff42be5899fa036d5ab95257933e89e4c5efd04267a09015917c6a617b86b82d7ab4f5d0de221 WHIRLPOOL 81ce5835b9eb1fe1b162f35d6e37762cc8d613e67c5791f078ecd0e354a87eb92e52452bd6e9a7f70953dabea99d197786e87ed64dc802223149b8e97d6de265 -AUX llvm-3.5.0-fix_LLVMExports_cmake.patch 1563 SHA256 924303a7fa7ee46276eb2984e3e2d9304873df1d63c0d878371cf98b4094aef0 SHA512 8e8c3ae2c8e2bac0d78a7f572ccfae9cfc30e52ffbfa953596c075cf6adc4e5881d2b80cad4d87bbf1de837d88352334bb51a331adc8d8db74354945c036637e WHIRLPOOL b525bbf3a7ade5906e9e35315af1ccb50c4392e1d104c516927a3ab9b627bc3d0fcf41bd0b77093f6743131f801d37d53d1065371e5c86eb4e7d538eb969b3a8 -AUX llvm-3.5.2-gcc-5.1.patch 516 SHA256 c964eecdfb0cbf4d2a59a553d7bdb3f16e70d8910e6aa7e9c768828ecbdfcea2 SHA512 dd12f9ad7b80625477c5af045cd16233a169c67f62bbc1fa1aaa8b0c975b585b447fcf0773e2fc4f83cc767967fd5fd3678527e447fef66841f40d98927ec4b3 WHIRLPOOL 628021a89d48b74d302199f75a827b89d8fa2ce6909ecba93f5dd64f584a6dc215a0b3cb6b46267d1fd7488594b3ca64de44a867905949e61ae5552cbb30fc82 -AUX llvm-3.6-gentoo-install.patch 3169 SHA256 318288e667623e22c441f7a1da8c3e27b3fff7426839a58a05e43dd0ac37d443 SHA512 9e13fd8606c6aa636d5e1cd3e32781fa4cae3266acf306f5c38f052a7520fc4b603022244b4502045d968c9ca28292539a17caa33b9b470353adfdbb8e159321 WHIRLPOOL 8f3b9b5150d2a29ba4f94a86235d12cf96c1a28ceb7f55fe7b90b3e5e074fe4883d449ac34cbe823ccc22f1ab8b3e2d05dadb39abaaac0a17e3870bbba1ea14e -AUX llvm-3.6.0-ocaml-ctypes-0.4.0.patch 1783 SHA256 3beb0718c10b57b125809d4de991b24d53618469119c652120802b584c7de184 SHA512 8c26e55939c82cca0f1ab9b276720e56cb8f22d1bfcffe228636d18feb3a51b62c408a1fed762d91430137eb231266df4038f88585428dd5d0af19de3749549e WHIRLPOOL be72dbe99b852cd85e1312f8c425e69a09b22ed6d3f5371e8b1ac9697cd2555195e0e36ae4b0d47fc4ee9d77ece883e4668e1c30da30c530bf7fdabfec827a8a -AUX llvm-3.7-lldb_python.patch 1278 SHA256 b6178aea3d2e364e6382b3eef62d45995e78e15e13f7811e93bab778d6974ff5 SHA512 b340fde309a9698766c54952b589ac18ace59b1e7e44c015e5f3c8ec54e66c948193faddad868a5d1df0a0d3e8746068a7b2260195bcac142552531e17eafa35 WHIRLPOOL cb88018ba02038bc0be2acb8dc54994487fdd338cc856194cccc3d70b2f79058759d8a92e8fdd958a1a73d10233bad6ab640dfec7e07fb1e14cc51f962d515b3 -AUX llvm-3.7-llvm-config.patch 4942 SHA256 46b185a44e87908ae8e2edfb07abb2a5e0aacaa56fa286ef5a4678353543ce58 SHA512 39fd04cb4de1b13110c7a3ed45ad7f97fa2a845551552ec69a53641a86c2c292784ef361cc61e314ce3e5f8e862d8b34a04d7e9c4c275834a3f5268c2628d7c7 WHIRLPOOL 18c05f521b946c25151922bd8642c5d6230c01643686ca6c16dff014c8a8b62bc11c13745b1eb97f1b39e92b364e2620e5efb1f20885d229a55d9a9afd189fad -AUX llvm-3.7-msan-fix.patch 3149 SHA256 e939e9403a0caf0cac3e08090ac6dcb872e0ee45cc8f68807d2425dba6ac8423 SHA512 9ab34a764921893af760e54a8513d57b8c6b64eb471c94970ed10d1b83eec458b537df47d30f79a0537ca5b024b9e1ce030f264f1aa8391792d64f06ed19cf8d WHIRLPOOL b198d77179795b0c56adfe3e21d92006579bec3145de880f62c012b95988026f5e5673cf94222b38928f9c88a63c7093c9b60c7ce23508eea727aad11aefad8a -AUX llvm-3.7-nodoctargz.patch 1903 SHA256 6364b822c82697b81bd37db63e059bad26c6e825bc47d894dffac5a3ff28098c SHA512 6fcad8138fb2ab19694bbc92e23c3b34579e5f15dc31b47dd4f0910325b9ec457913185eb78d8f68ae96fca6f48c3754a74de9b3185b25ae25efe41ec5d3348a WHIRLPOOL ce14af312aec1112e10bc213e4bc27f52d6a82aa0b08e3bcdd633795c5f073af2bb8f8e4f6386b22bc6709f654bd1df401303a475730a29f2aef8f9b4fc42342 -AUX llvm-3.7.1-llvm-config-0.patch 3555 SHA256 828b9144f03857b43307d2fe33856b7ec7a3986a9eaa0a2200400369b6184536 SHA512 944302abb7385d43e0b388accaadf7cc09cc1da1b66564c1c68c5ec7a49abc5b7f1683859efec083865410c52e76de7f4660c0564033a8ef4ee2cf9137c0ce32 WHIRLPOOL 4680991f1008c929ba8f34a5c778210641e45460200067e966d8633445afa6d7be41ebcd14dea415b9e20f3e95b6ac800bf0ed96dd8b293726c47d39b41b01b1 -AUX llvm-3.7.1-llvm-config-1.patch 17604 SHA256 6e93b92df89a94becd084479867e0251b13a272660bcf3571640b64ba60a7b3a SHA512 9c3072ac4bdb1fe5b4ae8715a52881d360657818e47a2c3f78cd3e88a73236603e2df7df88b26f36f25a97431b3e70a6c24ce457ba2fcf8f7177651f1245a482 WHIRLPOOL b701bdd7c45f5b4c3526af03fb27442ff33ef68def6d63822fdc8376edadc4280ae714a66f91cca237ce7a437b0738410b691c78922c4250a3c6a55a5746ebe0 -AUX llvm-3.7.1-llvm-config-2.patch 4918 SHA256 42a54aaf38fc24317bcc0e268b356320442eebe8a7f54c0179dcf6dabd1776fe SHA512 67adf538672cf5304ad9861605d3daeb77836d9326808fab9ce498969e202142315d6b260bcfb8b46ff714e3a100c6d9540a2761807159985045e9bb86c87540 WHIRLPOOL db7b60c8b5a19dc9b314faa32812198079257e31ddaf3bc781c14fc6a73a2956f0bf01803a99ef99a0ebb6e9038553b030861a6d7e247ab4c590c92553154c3c -AUX llvm-3.7.1-llvm-config-3.patch 1193 SHA256 8a9c8cb4199800a88419fc762c7c7e65e2dd2f519cfe4437def0005928c81eea SHA512 ea8670dd9327f75d6fcd5e5f06e2011899e57aa8cb04e00197ad5fcf79c3c5875736dcaa75a0f69664dd4381a7ae434af7eede71d36e1224596549fee5d9573d WHIRLPOOL 1718d5e671faefbba1192c891c1cddb87ac275e446d256637fc48e1275f54465a47e7cffb413bc348e437d2a659b9b9d607d71dc31ae62657a429f75cc058de1 -AUX llvm-3.8-lldb_six.patch 766 SHA256 fbd732d0f2a5fe0b2d0b5507525cff250efe868384cfd7c5a638586de8608b15 SHA512 5c3096eb168ac9a37d980d7253317de5c89abd78672e3afbe93a8b3f47a30aa87670f6b01e8a0480f930dd572fbb46bb6ad2c41e8bb11f2059db77aa229be8c2 WHIRLPOOL 5b02d5b6aacf1fa27a599a86cb35b771b855672bd2150baa3518e026a958e7e97b4e9ac04dd44c75b3de61057139aaec1315442127ad37d7f842c24cc454dd77 -AUX llvm-3.8-llvm-config.patch 4899 SHA256 2c3f1924652351c4e1f0eb59c560a94d333b2719ffe7e25891de9bd4efa203a6 SHA512 48e64847a7d767e67c3eb46342db5336bba96b9359becb0420f244a363968d9c5a856a46f9706c6475b8dcf50884f4257632faddd4ec6a66c8986cdb474ebdb5 WHIRLPOOL b5cb5d66f94c7167fa8d9f2fc7a4f9b41453fb282783200068710ebb3bc6bf9a8e7c892154f31bead88030e9880ad8a2986c93226b80aa17580e6aa7c720b73f -AUX llvm-3.8-soversion.patch 854 SHA256 faf88664d7adae8d1db834d177250279060c9e1dd59b47c3d2fae071d6b85b6c SHA512 201858f3ef2f14c98ed5647a1cfea76a455ef79482d32b7e191a11b28f3a3517f792b05e11655850245c5ac3d0c6fb0796a4f1dc5a2c72ddfc055b57f35c4538 WHIRLPOOL d817361a427b53c3daf8270a3cc9e202b3dc19b5937042ee4d68572b1fa3086c64b63d6255f2021c18cd927cf419374369ed21e980d6a200a07bcdb0fac965b5 -AUX llvm-3.9-llvm-config.patch 3160 SHA256 aaed834ab50d19a910e471415edc240e02da9029b0ab54f33bf1657770322fd3 SHA512 6d9dbba89425955f7f804b1042b131e9b221394a1422425e66e2f46b6249d8cb1a9d28210924d9ae9c054bc2808303abbec48a8b1d23a1419c793acbc366cf68 WHIRLPOOL cbcb0a32ded8bff3a7d44a559787319ba662b452401b52f707272ded101de4b132987d671d1208693a7e831576c7427adc5d7b45da4e33194ecb5b8268869eae -DIST cfe-3.7.1.src.tar.xz 9110616 SHA256 56e2164c7c2a1772d5ed2a3e57485ff73ff06c97dff12edbeea1acc4412b0674 SHA512 8e3285a32ad0fd4721fa77c4fb9709f31bb4e4f7cb5245357aaf57b0767b6ef18a30d902b59d1437a6febffb6c2128214f9ce5aa913bb298743221a28c4f9de5 WHIRLPOOL ce300f5023bddda59ee055e4dccdca8bf459fae5d4e91c44262d2830c406b798d697d1bf3c6326ff41b969a8439f94a3c83570f1d0151a7f0223eb0d8f324f7b -DIST cfe-3.8.0.src.tar.xz 9627228 SHA256 04149236de03cf05232d68eb7cb9c50f03062e339b68f4f8a03b650a11536cf9 SHA512 fef431d63f95a394d53e3857fb6a6bde7a7b27f40ef5111b4353bcb63ac26febec8a9eb84780187c49699ab099834f13f996f085d02c365676b3fa5bbcc03dcd WHIRLPOOL 10fd94f75f645318ed3436454ccffd570a88cafe35e870563b5f4d89c37b9bdbe282d8793301ca53db6774cc223b2ff7ab0af99293413cac3deefcf5150fcca3 -DIST clang-tools-extra-3.7.1.src.tar.xz 277476 SHA256 4a91edaccad1ce984c7c49a4a87db186b7f7b21267b2b03bcf4bd7820715bc6b SHA512 06e2db8af75f1e6ee82da6ee723b5256b9e3f6ba196428f18944ec02d07df26d04329ca8824a083c5f25274ce7e3469aa75e3a29ccfbdb6375524841d65e3ad7 WHIRLPOOL 2c1a459d6aff6bc24d5c8d38120ab665adbef61394050781a9707d50e83dae1b4997ed19459086e9bd7f6dd38a09c295d135e33515c947d64a7f1ab714ad8beb -DIST clang-tools-extra-3.8.0.src.tar.xz 334072 SHA256 afbda810106a6e64444bc164b921be928af46829117c95b996f2678ce4cb1ec4 SHA512 f0e593a76df5485f403079bd2fbb4e51c3d1c3fc4e63e2c2910894e8f2a7c14b47265435f3c52f035fb3fe2f595812d0f9869235296157a39c071a23e6a8b178 WHIRLPOOL 4928669a3c019eebe0a98ee72e25ef70ddf3c1d29e6a4aa18e408276b2a870069460c39e0e8fbe960d8d56127bb6951433d1fd89015d192951004e527b065ec9 -DIST compiler-rt-3.7.1.src.tar.xz 1181772 SHA256 9d4769e4a927d3824bcb7a9c82b01e307c68588e6de4e7f04ab82d82c5af8181 SHA512 bf434519ea0838264c30de1e1e8681320aa868df0ecc825a45c659077b963a4120c18216946558cbf8aea24a8ac8ec39af2066dab906bc7cabc0894d51d61325 WHIRLPOOL 0bea047e48622884a6fc6bb3826046e9de5b3192006cc41c0ccd9d6c611674869c3c15988b531a0f7d9fea2cf951b90ecef385b85db765c6f99a48692fdcf223 -DIST compiler-rt-3.8.0.src.tar.xz 1270128 SHA256 c8d3387e55f229543dac1941769120f24dc50183150bf19d1b070d53d29d56b0 SHA512 21ba548b6b35a79aa291adba7f83db14c33855fa3cf376f2ad75bd22bb454501b74f0ea4f71bc03a864135862c800b101d3cd790e54e687c2a3459c64218b9c3 WHIRLPOOL 63ceb498fbc4083afda4f4aa12e44b8a6d2b58408edacd7d578d3cd6a63f0c1074e453b950fae4fee51690b3f79700e7752b6ceb3e6980c88541314993ce71a5 -DIST lldb-3.7.1.src.tar.xz 10650524 SHA256 9a0bc315ef55f44c98cdf92d064df0847f453ed156dd0ef6a87e04f5fd6a0e01 SHA512 d2d3e1052026edd6ef9113ff5362acb4a32cef598098b4031c35e389301130ef2e1bda594f30de4d65c9fdc0beaecdd35afcf36676eb540baad34015aca294d1 WHIRLPOOL bba9c700788f0cf86ac1de51383a223e1c92f724719cdd327d83189cb77714c1e10fb78569aeed3b3c639062a3410bb114f646a271fd0d9e8c9a8e45d090330a -DIST lldb-3.8.0.src.tar.xz 10929768 SHA256 e3f68f44147df0433e7989bf6ed1c58ff28d7c68b9c47553cb9915f744785a35 SHA512 a491209ae12b0c7d938ebd94362396a50922326ed24ed11f71b1f19b61274a34a92d2bd46857b44081e7fa3e6d0a641d148bd4022f8edf71f80ff2aa7a55ebef WHIRLPOOL c498c22acab867419143745ce0212c70bdfc141dbae19ab53221908eba7961aae6a029cbad01b8409e6fbc187550141ed87f32366dd847ac57754891fbbc4049 -DIST llvm-3.7.0-manpages.tar.bz2 38095 SHA256 8597fa532464c6336aefbbef0b1ce452aaa98d474fa58108c6a6f57a9ccd6785 SHA512 ea70ac15dbaef3740b31f66aa798338f7f9b82484586582aa62e0364f9d74bf175be2f4f29721df253b8157c1cbc146ab9045c0656c42a6375434e994786b643 WHIRLPOOL 743b339b0df7c52d270a5197e9e765dfd92d4b5acee94cf9d9d7713e1a75aa9d987b3f5adab0952e7267febf88b318d0f31cb45847e2b0b42c7c7373b2358358 -DIST llvm-3.7.1.src.tar.xz 14592544 SHA256 be7794ed0cec42d6c682ca8e3517535b54555a3defabec83554dbc74db545ad5 SHA512 ac521debc02f6deba96ef975d6a546b0c5c77299c1dbf5e1b87a7974ff5e7fd715bd7e384b92d9adf572ce47130bdbf6d3c648eb0d7f72f16f976292e4909e90 WHIRLPOOL 788ce0907b906ebee595c766713bec5067563c8aba7460211f5830e116df7c830de84704834c0df2f2f2c90354d75521e4a4aff57e769a2d8ab590778c1e4a70 -DIST llvm-3.8.0-manpages.tar.bz2 37889 SHA256 4dda7f69f9412e0fb50d32631df34d6ea7f93c945c9a59cb050a99f1d2d0508b SHA512 a93ed7a25b75c237a0967ba7a501c71af3e7e9292ebabf69733bc637e9a4534dcaee539c6b1f6b2df7a87103c2371b1cf130fac05b88047100988c814e89ab0f WHIRLPOOL 9790a576fd4db798c2339bb4ea1dc973f1057177364770a104be7916998a1ad824e6b4eee296066ddd32eb5e6c57ffd5716457cecbd8ca9fe1b317d0d5ed2676 -DIST llvm-3.8.0.src.tar.xz 16580932 SHA256 555b028e9ee0f6445ff8f949ea10e9cd8be0d084840e21fbbe1d31d51fc06e46 SHA512 2c76e79d803768ed20af6ca1801cf2518071bf9835c54580ea3eb6219a66cdcf8b4c575f192c15082cc18d2468b7611dacb57950b605813a2317125c2d33c138 WHIRLPOOL f7219f3324080f22158b08eb23b5b545d303090d0bb8cde6ee971da829dd52837832a127792b153006568e0c7c0163c1095d1e258600f4359df347148e965b94 -EBUILD llvm-3.7.1-r1.ebuild 16167 SHA256 c7d895327deea82d9067a787823615bb3d4d169f938a68e0670caeae98f1ca7e SHA512 88bbcd62b02aa9a0039a94e28aa67980e62ce8f42d9e99627a3821a82ed9cd1bd7632bc28a2202473c91c051978fbc0cb5dbd107a7c5d520174e8483c2c58ca0 WHIRLPOOL 6bf31fc553129989eadb64dd391d1f60c023280bdc134bbd934d2a418827d677700b6ec847a41d61c85a5e58c9033558613351fd4c66baddab85e312acaebeac -EBUILD llvm-3.8.0-r3.ebuild 15991 SHA256 2f5a430b28a7888bb0188673bc62a42134522db33e50e8755d3db7c1efe01235 SHA512 4e0de371fbee12b3ab37276ca671a76790897c9c188e64e5a90c16c97400e6093aeaf099116a07ab3ce0acdfc3321077ef85a9ba734910103961970343cde329 WHIRLPOOL 8c2b6d2739d4d59313b83dcdfd79531f50ae2b487bbd1c69bba4e4bebd1c07be8215e9d6fc85d20fa363cd7b53bfabad1326d1a086c020d7117d33d97d78413d -MISC metadata.xml 2785 SHA256 7329cb36d95ea94ccabceb9d228eb77cb3186e53b360dc27717393338d4147fc SHA512 3acac76248322ac92fae2a4cde7fa113b356f43bafabd5bd99d6937b4f9a39f74676de65c17cd8df634b65052a0777f6336aed598ccc1dd17a97a564096ae9d5 WHIRLPOOL 87d38e5091fc1ea70282a637864a268a928acb40b3b4c962cca543a48adf78ad035f391bba4099983fa1384854052966bcf1d839bdfa72c9081f876d5478c800 diff --git a/sys-devel/llvm/files/cl-patches/0001-r600-Add-some-intrinsic-definitions.patch b/sys-devel/llvm/files/cl-patches/0001-r600-Add-some-intrinsic-definitions.patch deleted file mode 100644 index 9d99c9c..0000000 --- a/sys-devel/llvm/files/cl-patches/0001-r600-Add-some-intrinsic-definitions.patch +++ /dev/null @@ -1,64 +0,0 @@ -From e25389b66b5ced3a2b5461077dcc9a505d334e3d Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Tue, 13 Mar 2012 14:12:21 -0400 -Subject: [PATCH 1/2] r600: Add some intrinsic definitions - ---- - include/llvm/Intrinsics.td | 1 + - include/llvm/IntrinsicsR600.td | 35 +++++++++++++++++++++++++++++++++++ - 2 files changed, 36 insertions(+), 0 deletions(-) - create mode 100644 include/llvm/IntrinsicsR600.td - -diff --git a/include/llvm/Intrinsics.td b/include/llvm/Intrinsics.td -index 069f907..e90dd85 100644 ---- a/include/llvm/Intrinsics.td -+++ b/include/llvm/Intrinsics.td -@@ -441,3 +441,4 @@ include "llvm/IntrinsicsCellSPU.td" - include "llvm/IntrinsicsXCore.td" - include "llvm/IntrinsicsPTX.td" - include "llvm/IntrinsicsHexagon.td" -+include "llvm/IntrinsicsR600.td" -diff --git a/include/llvm/IntrinsicsR600.td b/include/llvm/IntrinsicsR600.td -new file mode 100644 -index 0000000..789fecb ---- /dev/null -+++ b/include/llvm/IntrinsicsR600.td -@@ -0,0 +1,35 @@ -+//===- IntrinsicsR600.td - Defines R600 intrinsics ---------*- tablegen -*-===// -+// -+// The LLVM Compiler Infrastructure -+// -+// This file is distributed under the University of Illinois Open Source -+// License. See LICENSE.TXT for details. -+// -+//===----------------------------------------------------------------------===// -+// -+// This file defines all of the R600-specific intrinsics. -+// -+//===----------------------------------------------------------------------===// -+// -+// Authors: Tom Stellard <thomas.stellard@amd.com> -+// -+ -+let TargetPrefix = "r600" in { -+ -+class R600ReadPreloadRegisterIntrinsic<string name> -+ : Intrinsic<[llvm_i32_ty], [], [IntrNoMem]>, -+ GCCBuiltin<name>; -+ -+multiclass R600ReadPreloadRegisterIntrinsic_xyz<string prefix> { -+ def _x : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_x")>; -+ def _y : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_y")>; -+ def _z : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_z")>; -+} -+ -+defm int_r600_read_ngroups : R600ReadPreloadRegisterIntrinsic_xyz < -+ "__builtin_r600_read_ngroups">; -+defm int_r600_read_tgid : R600ReadPreloadRegisterIntrinsic_xyz < -+ "__builtin_r600_read_tgid">; -+defm int_r600_read_tidig : R600ReadPreloadRegisterIntrinsic_xyz < -+ "__builtin_r600_read_tidig">; -+} // End TargetPrefix = "r600" --- -1.7.7.6 - diff --git a/sys-devel/llvm/files/cl-patches/0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch b/sys-devel/llvm/files/cl-patches/0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch deleted file mode 100644 index db176dd..0000000 --- a/sys-devel/llvm/files/cl-patches/0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 17667fa3450470f7c89fc2ba4631d908cf510749 Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Wed, 14 Mar 2012 11:19:35 -0400 -Subject: [PATCH 2/2] r600: Add get_global_size and get_local_size intrinsics - ---- - include/llvm/IntrinsicsR600.td | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/include/llvm/IntrinsicsR600.td b/include/llvm/IntrinsicsR600.td -index 789fecb..0473acb 100644 ---- a/include/llvm/IntrinsicsR600.td -+++ b/include/llvm/IntrinsicsR600.td -@@ -26,6 +26,10 @@ multiclass R600ReadPreloadRegisterIntrinsic_xyz<string prefix> { - def _z : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_z")>; - } - -+defm int_r600_read_global_size : R600ReadPreloadRegisterIntrinsic_xyz < -+ "__builtin_r600_read_global_size">; -+defm int_r600_read_local_size : R600ReadPreloadRegisterIntrinsic_xyz < -+ "__builtin_r600_read_local_size">; - defm int_r600_read_ngroups : R600ReadPreloadRegisterIntrinsic_xyz < - "__builtin_r600_read_ngroups">; - defm int_r600_read_tgid : R600ReadPreloadRegisterIntrinsic_xyz < --- -1.7.7.6 - diff --git a/sys-devel/llvm/files/clang-3.1-gentoo-runtime-gcc-detection-v3.patch b/sys-devel/llvm/files/clang-3.1-gentoo-runtime-gcc-detection-v3.patch deleted file mode 100644 index 49f1085..0000000 --- a/sys-devel/llvm/files/clang-3.1-gentoo-runtime-gcc-detection-v3.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -upNr a/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp b/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp ---- a/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp 2012-05-24 03:32:31.593191000 -0400 -+++ b/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp 2012-05-24 03:38:31.733163513 -0400 -@@ -1145,6 +1145,25 @@ Generic_GCC::GCCInstallationDetector::GC - Prefixes.push_back(D.InstalledDir + "/.."); - } - -+ llvm::OwningPtr<llvm::MemoryBuffer> File; -+ for (unsigned k = 0, ke = CandidateTripleAliases.size(); k < ke; ++k) { -+ if (!llvm::MemoryBuffer::getFile(D.SysRoot + "/etc/env.d/gcc/config-" + CandidateTripleAliases[k].str(), File)) -+ { -+ bool Exists; -+ const std::string VersionText = File.get()->getBuffer().rsplit('-').second.substr(0,5).str(); -+ const std::string GentooPath = D.SysRoot + "/usr/lib/gcc/" + CandidateTripleAliases[k].str() + "/" + VersionText; -+ if (!llvm::sys::fs::exists(GentooPath + "/crtbegin.o", Exists) && Exists) -+ { -+ Version = GCCVersion::Parse(VersionText); -+ GCCInstallPath = GentooPath; -+ GCCParentLibPath = GCCInstallPath + "/../../.."; -+ GCCTriple.setTriple(CandidateTripleAliases[k]); -+ IsValid = true; -+ return; -+ } -+ } -+ } -+ - // Loop over the various components which exist and select the best GCC - // installation available. GCC installs are ranked by version number. - Version = GCCVersion::Parse("0.0.0"); diff --git a/sys-devel/llvm/files/clang-3.3-gcc-header-path.patch b/sys-devel/llvm/files/clang-3.3-gcc-header-path.patch deleted file mode 100644 index dc9a4f7..0000000 --- a/sys-devel/llvm/files/clang-3.3-gcc-header-path.patch +++ /dev/null @@ -1,90 +0,0 @@ -Backport handling of 'g++-vX.Y' header location. - -Fixes: https://bugs.gentoo.org/show_bug.cgi?id=487584 ---- - tools/clang/lib/Driver/ToolChains.cpp | 20 ++++++++++++-------- - tools/clang/lib/Driver/ToolChains.h | 3 +++ - 2 files changed, 15 insertions(+), 8 deletions(-) - -diff --git a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp -index 7c9e9c0..e38d42d 100644 ---- a/tools/clang/lib/Driver/ToolChains.cpp -+++ b/tools/clang/lib/Driver/ToolChains.cpp -@@ -917,17 +917,19 @@ Darwin_Generic_GCC::ComputeEffectiveClangTriple(const ArgList &Args, - /// This is the primary means of forming GCCVersion objects. - /*static*/ - Generic_GCC::GCCVersion Linux::GCCVersion::Parse(StringRef VersionText) { -- const GCCVersion BadVersion = { VersionText.str(), -1, -1, -1, "" }; -+ const GCCVersion BadVersion = { VersionText.str(), -1, -1, -1, "", "", "" }; - std::pair<StringRef, StringRef> First = VersionText.split('.'); - std::pair<StringRef, StringRef> Second = First.second.split('.'); - -- GCCVersion GoodVersion = { VersionText.str(), -1, -1, -1, "" }; -+ GCCVersion GoodVersion = { VersionText.str(), -1, -1, -1, "", "", "" }; - if (First.first.getAsInteger(10, GoodVersion.Major) || - GoodVersion.Major < 0) - return BadVersion; -+ GoodVersion.MajorStr = First.first.str(); - if (Second.first.getAsInteger(10, GoodVersion.Minor) || - GoodVersion.Minor < 0) - return BadVersion; -+ GoodVersion.MinorStr = Second.first.str(); - - // First look for a number prefix and parse that if present. Otherwise just - // stash the entire patch string in the suffix, and leave the number -@@ -945,7 +947,7 @@ Generic_GCC::GCCVersion Linux::GCCVersion::Parse(StringRef VersionText) { - if (PatchText.slice(0, EndNumber).getAsInteger(10, GoodVersion.Patch) || - GoodVersion.Patch < 0) - return BadVersion; -- GoodVersion.PatchSuffix = PatchText.substr(EndNumber).str(); -+ GoodVersion.PatchSuffix = PatchText.substr(EndNumber); - } - } - -@@ -2590,11 +2592,11 @@ void Linux::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, - // equivalent to '/usr/include/c++/X.Y' in almost all cases. - StringRef LibDir = GCCInstallation.getParentLibPath(); - StringRef InstallDir = GCCInstallation.getInstallPath(); -- StringRef Version = GCCInstallation.getVersion().Text; - StringRef TripleStr = GCCInstallation.getTriple().str(); -+ const GCCVersion &Version = GCCInstallation.getVersion(); - - if (addLibStdCXXIncludePaths(LibDir.str() + "/../include", -- "/c++/" + Version.str(), -+ "/c++/" + Version.Text, - TripleStr, - GCCInstallation.getMultiarchSuffix(), - DriverArgs, CC1Args)) -@@ -2602,10 +2604,12 @@ void Linux::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, - - const std::string IncludePathCandidates[] = { - // Gentoo is weird and places its headers inside the GCC install, so if the -- // first attempt to find the headers fails, try this pattern. -- InstallDir.str() + "/include/g++-v4", -+ // first attempt to find the headers fails, try these patterns. -+ InstallDir.str() + "/include/g++-v" + Version.MajorStr + "." + -+ Version.MinorStr, -+ InstallDir.str() + "/include/g++-v" + Version.MajorStr, - // Android standalone toolchain has C++ headers in yet another place. -- LibDir.str() + "/../" + TripleStr.str() + "/include/c++/" + Version.str(), -+ LibDir.str() + "/../" + TripleStr.str() + "/include/c++/" + Version.Text, - // Freescale SDK C++ headers are directly in <sysroot>/usr/include/c++, - // without a subdirectory corresponding to the gcc version. - LibDir.str() + "/../include/c++", -diff --git a/tools/clang/lib/Driver/ToolChains.h b/tools/clang/lib/Driver/ToolChains.h -index 3afd8dd..04cf467 100644 ---- a/tools/clang/lib/Driver/ToolChains.h -+++ b/tools/clang/lib/Driver/ToolChains.h -@@ -48,6 +48,9 @@ protected: - /// \brief The parsed major, minor, and patch numbers. - int Major, Minor, Patch; - -+ /// \brief The text of the parsed major, and major+minor versions. -+ std::string MajorStr, MinorStr; -+ - /// \brief Any textual suffix on the patch number. - std::string PatchSuffix; - --- -1.8.3.2 - diff --git a/sys-devel/llvm/files/clang-3.3-gentoo-install.patch b/sys-devel/llvm/files/clang-3.3-gentoo-install.patch deleted file mode 100644 index 5519fbc..0000000 --- a/sys-devel/llvm/files/clang-3.3-gentoo-install.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 1a539a8868070e49966c6b5f5e4b9f1257acd7dc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl> -Date: Fri, 19 Jul 2013 10:23:57 +0200 -Subject: [PATCH] clang gentoo install - ---- - tools/clang/lib/Driver/Tools.cpp | 4 ++-- - tools/clang/tools/scan-build/scan-build | 4 ++-- - tools/clang/tools/scan-view/scan-view | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp -index e014980..6e60513 100644 ---- a/tools/clang/lib/Driver/Tools.cpp -+++ b/tools/clang/lib/Driver/Tools.cpp -@@ -219,7 +219,7 @@ static void addProfileRT(const ToolChain &TC, const ArgList &Args, - // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is - // not supported by old linkers. - std::string ProfileRT = -- std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a"; -+ "-l:libprofile_rt.a"; - - CmdArgs.push_back(Args.MakeArgString(ProfileRT)); - } -@@ -6177,7 +6177,7 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA, - // forward. - if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) { - 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 22d5289..dcb4822 100755 ---- a/tools/clang/tools/scan-build/scan-build -+++ b/tools/clang/tools/scan-build/scan-build -@@ -410,7 +410,7 @@ sub CopyFiles { - - 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); -@@ -420,7 +420,7 @@ sub CopyFiles { - 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.3.2 - diff --git a/sys-devel/llvm/files/clang-3.4-darwin_build_fix.patch b/sys-devel/llvm/files/clang-3.4-darwin_build_fix.patch deleted file mode 100644 index 113b04b..0000000 --- a/sys-devel/llvm/files/clang-3.4-darwin_build_fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -Our (gcc/binutils) toolchain doesn't do ARM targets, hence we will get -"unable to interface with target machine" errors while building if we -attempt to. Disable those targets. - -Patch by Reza Jelveh from -https://github.com/fishman/timebomb-gentoo-osx-overlay/blob/master/sys-devel/llvm/files/llvm-3.4-fix_darwin_build.patch - ---- a/projects/compiler-rt/make/platform/clang_darwin_embedded.mk -+++ b/projects/compiler-rt/make/platform/clang_darwin_embedded.mk -@@ -27,20 +27,20 @@ UniversalArchs := - # Soft-float version of the runtime. No floating-point instructions will be used - # and the ABI (out of necessity) passes floating values in normal registers: - # non-VFP variant of the AAPCS. --Configs += soft_static --UniversalArchs.soft_static := armv6m armv7m armv7em armv7 -+# Configs += soft_static -+# UniversalArchs.soft_static := armv6m armv7m armv7em armv7 - - # Hard-float version of the runtime. On ARM VFP instructions and registers are - # allowed, and floating point values get passed in them. VFP variant of the - # AAPCS. - Configs += hard_static --UniversalArchs.hard_static := armv7em armv7 i386 x86_64 -+UniversalArchs.hard_static := i386 x86_64 - --Configs += soft_pic --UniversalArchs.soft_pic := armv6m armv7m armv7em armv7 -+# Configs += soft_pic -+# UniversalArchs.soft_pic := armv6m armv7m armv7em armv7 - - Configs += hard_pic --UniversalArchs.hard_pic := armv7em armv7 i386 x86_64 -+UniversalArchs.hard_pic := i386 x86_64 - - CFLAGS := -Wall -Werror -Oz -fomit-frame-pointer -ffreestanding - ---- a/tools/clang/runtime/compiler-rt/Makefile -+++ b/tools/clang/runtime/compiler-rt/Makefile -@@ -85,7 +85,7 @@ RuntimeLibrary.darwin.Configs := \ - profile_osx.a profile_ios.a \ - ubsan_osx.a - RuntimeLibrary.darwin_embedded.Configs := \ -- soft_static.a hard_static.a soft_pic.a hard_pic.a -+ hard_static.a hard_pic.a - - # Support building compiler-rt with relocatable SDKs. - # diff --git a/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch b/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch deleted file mode 100644 index ed332f3..0000000 --- a/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp -+++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp -@@ -233,6 +233,7 @@ - case llvm::Triple::Bitrig: - break; - default: -+ AddPath("@GENTOO_PORTAGE_EPREFIX@/usr/include", System, false); - // FIXME: temporary hack: hard-coded paths. - AddPath("/usr/local/include", System, false); - break; -@@ -505,6 +506,7 @@ - // Add the default framework include paths on Darwin. - if (HSOpts.UseStandardSystemIncludes) { - if (triple.isOSDarwin()) { -+ AddPath("@GENTOO_PORTAGE_EPREFIX@/Frameworks", System, true); - AddPath("/System/Library/Frameworks", System, true); - AddPath("/Library/Frameworks", System, true); - } diff --git a/sys-devel/llvm/files/clang-3.4-gentoo-install.patch b/sys-devel/llvm/files/clang-3.4-gentoo-install.patch deleted file mode 100644 index 0a1d9eb..0000000 --- a/sys-devel/llvm/files/clang-3.4-gentoo-install.patch +++ /dev/null @@ -1,80 +0,0 @@ -From a12fc090b3b43fe25c7de50c09782611e3834aeb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sat, 14 Jun 2014 19:35:33 +0200 -Subject: [PATCH] clang gentoo fixes - ---- - tools/clang/lib/Driver/Tools.cpp | 6 +++--- - tools/clang/tools/scan-build/scan-build | 4 ++-- - tools/clang/tools/scan-view/scan-view | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp -index b013eb5..dbbcacb 100644 ---- a/tools/clang/lib/Driver/Tools.cpp -+++ b/tools/clang/lib/Driver/Tools.cpp -@@ -222,7 +222,7 @@ static void addProfileRT(const ToolChain &TC, const ArgList &Args, - // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is - // not supported by old linkers. - std::string ProfileRT = -- std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a"; -+ "-l:libprofile_rt.a"; - - CmdArgs.push_back(Args.MakeArgString(ProfileRT)); - } -@@ -5911,7 +5911,7 @@ void freebsd::Link::ConstructJob(Compilation &C, const JobAction &JA, - // forward. - if (D.IsUsingLTO(Args)) { - 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 -@@ -6534,7 +6534,7 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA, - // forward. - if (D.IsUsingLTO(Args)) { - 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 @@ sub CopyFiles { - - 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 @@ sub CopyFiles { - 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) --- -2.0.0 - 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-3.5-gentoo-runtime-gcc-detection-v3.patch b/sys-devel/llvm/files/clang-3.5-gentoo-runtime-gcc-detection-v3.patch deleted file mode 100644 index 1f81af0..0000000 --- a/sys-devel/llvm/files/clang-3.5-gentoo-runtime-gcc-detection-v3.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 916572e1243633ddf913c8f32771a3a7f70fd853 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Fri, 5 Sep 2014 16:49:35 +0200 -Subject: [PATCH] Support obtaining active toolchain from gcc-config. - ---- - tools/clang/lib/Driver/ToolChains.cpp | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp -index b46f69d..2d4374d 100644 ---- a/tools/clang/lib/Driver/ToolChains.cpp -+++ b/tools/clang/lib/Driver/ToolChains.cpp -@@ -1253,6 +1253,25 @@ Generic_GCC::GCCInstallationDetector::init( - Prefixes.push_back("/usr"); - } - -+ for (unsigned k = 0, ke = CandidateTripleAliases.size(); k < ke; ++k) { -+ llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File = -+ llvm::MemoryBuffer::getFile(D.SysRoot + "/etc/env.d/gcc/config-" + CandidateTripleAliases[k].str()); -+ if (File) -+ { -+ const std::string VersionText = File.get()->getBuffer().rsplit('-').second.substr(0,5).str(); -+ const std::string GentooPath = D.SysRoot + "/usr/lib/gcc/" + CandidateTripleAliases[k].str() + "/" + VersionText; -+ if (llvm::sys::fs::exists(GentooPath + "/crtbegin.o")) -+ { -+ Version = GCCVersion::Parse(VersionText); -+ GCCInstallPath = GentooPath; -+ GCCParentLibPath = GCCInstallPath + "/../../.."; -+ GCCTriple.setTriple(CandidateTripleAliases[k]); -+ IsValid = true; -+ return; -+ } -+ } -+ } -+ - // Loop over the various components which exist and select the best GCC - // installation available. GCC installs are ranked by version number. - Version = GCCVersion::Parse("0.0.0"); --- -2.1.0 - diff --git a/sys-devel/llvm/files/clang-3.6-fbsd-gcc49.patch b/sys-devel/llvm/files/clang-3.6-fbsd-gcc49.patch deleted file mode 100644 index 31f5fc2..0000000 --- a/sys-devel/llvm/files/clang-3.6-fbsd-gcc49.patch +++ /dev/null @@ -1,25 +0,0 @@ -Fix build fails with using gcc-4.9 on Gentoo/FreeBSD -https://bugs.gentoo.org/show_bug.cgi?id=548444 - -diff --git a/llvm-3.6.0.src/tools/clang/lib/Driver/MSVCToolChain.cpp b/llvm-3.6.0.src/tools/clang/lib/Driver/MSVCToolChain.cpp -index d6bd5c3..372f76f 100644 ---- a/llvm-3.6.0.src/tools/clang/lib/Driver/MSVCToolChain.cpp -+++ b/llvm-3.6.0.src/tools/clang/lib/Driver/MSVCToolChain.cpp -@@ -22,6 +22,8 @@ - #include "llvm/Support/FileSystem.h" - #include "llvm/Support/Process.h" - -+#include <cstdio> -+ - // Include the necessary headers to interface with the Windows registry and - // environment. - #if defined(LLVM_ON_WIN32) -@@ -212,7 +214,7 @@ bool MSVCToolChain::getWindowsSDKDir(std::string &path, int &major, - "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\$VERSION", - "InstallationFolder", path, &sdkVersion); - if (!sdkVersion.empty()) -- ::sscanf(sdkVersion.c_str(), "v%d.%d", &major, &minor); -+ std::sscanf(sdkVersion.c_str(), "v%d.%d", &major, &minor); - return hasSDKDir && !path.empty(); - } - diff --git a/sys-devel/llvm/files/clang-3.6-gentoo-install.patch b/sys-devel/llvm/files/clang-3.6-gentoo-install.patch deleted file mode 100644 index 6d76ba9..0000000 --- a/sys-devel/llvm/files/clang-3.6-gentoo-install.patch +++ /dev/null @@ -1,48 +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 -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-3.7-strip_doc_refs.patch b/sys-devel/llvm/files/clang-3.7-strip_doc_refs.patch deleted file mode 100644 index 9576b92..0000000 --- a/sys-devel/llvm/files/clang-3.7-strip_doc_refs.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- tools/clang/docs/AddressSanitizer.rst 2015-06-26 01:36:44.000000000 +0200 -+++ tools/clang/docs/AddressSanitizer.rst 2015-08-23 15:35:10.399174574 +0200 -@@ -198,7 +198,7 @@ - Some code should not be instrumented by AddressSanitizer. One may use the - function attribute ``__attribute__((no_sanitize("address")))`` - (which has deprecated synonyms --:ref:`no_sanitize_address <langext-address_sanitizer>` and -+`no_sanitize_address` and - `no_address_safety_analysis`) to disable instrumentation of a particular - function. This attribute may not be supported by other compilers, so we suggest - to use it together with ``__has_feature(address_sanitizer)``. ---- tools/clang/docs/MemorySanitizer.rst 2015-02-26 16:59:30.000000000 +0100 -+++ tools/clang/docs/MemorySanitizer.rst 2015-08-23 15:35:28.002200413 +0200 -@@ -82,7 +82,7 @@ - - Some code should not be checked by MemorySanitizer. - One may use the function attribute --:ref:`no_sanitize_memory <langext-memory_sanitizer>` -+`no_sanitize_memory` - to disable uninitialized checks in a particular function. - MemorySanitizer may still instrument such functions to avoid false positives. - This attribute may not be ---- tools/clang/docs/ThreadSanitizer.rst 2015-02-18 23:26:20.000000000 +0100 -+++ tools/clang/docs/ThreadSanitizer.rst 2015-08-23 15:34:53.918150364 +0200 -@@ -88,7 +88,7 @@ - - Some code should not be instrumented by ThreadSanitizer. - One may use the function attribute --:ref:`no_sanitize_thread <langext-thread_sanitizer>` -+`no_sanitize_thread` - to disable instrumentation of plain (non-atomic) loads/stores in a particular function. - ThreadSanitizer still instruments such functions to avoid false positives and - provide meaningful stack traces. -@@ -102,7 +102,7 @@ - ThreadSanitizer supports ``src`` and ``fun`` entity types in - :doc:`SanitizerSpecialCaseList`, that can be used to suppress data race reports in - the specified source files or functions. Unlike functions marked with --:ref:`no_sanitize_thread <langext-thread_sanitizer>` attribute, -+`no_sanitize_thread` attribute, - blacklisted functions are not instrumented at all. This can lead to false positives - due to missed synchronization via atomic operations and missed stack frames in reports. - diff --git a/sys-devel/llvm/files/clang-3.8-compiler-rt-fbsd.patch b/sys-devel/llvm/files/clang-3.8-compiler-rt-fbsd.patch deleted file mode 100644 index 297620b..0000000 --- a/sys-devel/llvm/files/clang-3.8-compiler-rt-fbsd.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://llvm.org/bugs/show_bug.cgi?id=26651 -https://github.com/llvm-mirror/compiler-rt/commit/6606c7b50cbb4ec7eab4ecbebbbaaa049734bbd3 - -diff --git a/projects/compiler-rt/lib/tsan/CMakeLists.txt b/projects/compiler-rt/lib/tsan/CMakeLists.txt -index c185cfa..a151c6c 100644 ---- a/projects/compiler-rt/lib/tsan/CMakeLists.txt -+++ b/projects/compiler-rt/lib/tsan/CMakeLists.txt -@@ -192,7 +192,11 @@ endif() - add_dependencies(compiler-rt tsan) - - # Make sure that non-platform-specific files don't include any system headers. --if(COMPILER_RT_HAS_SYSROOT_FLAG) -+# FreeBSD does not install a number of Clang-provided headers for the compiler -+# in the base system due to incompatibilities between FreeBSD's and Clang's -+# versions. As a workaround do not use --sysroot=. on FreeBSD until this is -+# addressed. -+if(COMPILER_RT_HAS_SYSROOT_FLAG AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD") - file(GLOB _tsan_generic_sources rtl/tsan*) - file(GLOB _tsan_platform_sources rtl/tsan*posix* rtl/tsan*mac* - rtl/tsan*linux*) diff --git a/sys-devel/llvm/files/clang-3.8-gcc4.9-search-path.patch b/sys-devel/llvm/files/clang-3.8-gcc4.9-search-path.patch deleted file mode 100644 index bafe218..0000000 --- a/sys-devel/llvm/files/clang-3.8-gcc4.9-search-path.patch +++ /dev/null @@ -1,70 +0,0 @@ -From af4db76e059c1a3f4a7f437001051ccebc8a50fe Mon Sep 17 00:00:00 2001 -From: Chandler Carruth <chandlerc@gmail.com> -Date: Sun, 8 May 2016 07:59:56 +0000 -Subject: [PATCH] Teach header search about GCC 4.9 header search paths in - Gentoo, they now use the full GCC version in their weird suffix. - -git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@268874 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/Driver/ToolChains.cpp | 1 + - .../Inputs/gentoo_linux_gcc_4.9.3_tree/usr/include/.keep | 0 - .../usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/crtbegin.o | 0 - .../x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3/.keep | 0 - .../usr/x86_64-pc-linux-gnu/lib/.keep | 0 - test/Driver/linux-header-search.cpp | 15 +++++++++++++++ - 6 files changed, 16 insertions(+) - create mode 100644 test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/include/.keep - create mode 100644 test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/crtbegin.o - create mode 100644 test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3/.keep - create mode 100644 test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/x86_64-pc-linux-gnu/lib/.keep - -diff --git a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp -index f905b5d..1bf17e4 100644 ---- a/tools/clang/lib/Driver/ToolChains.cpp -+++ b/tools/clang/lib/Driver/ToolChains.cpp -@@ -4134,6 +4134,7 @@ void Linux::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, - const std::string LibStdCXXIncludePathCandidates[] = { - // Gentoo is weird and places its headers inside the GCC install, - // so if the first attempt to find the headers fails, try these patterns. -+ InstallDir.str() + "/include/g++-v" + Version.Text, - InstallDir.str() + "/include/g++-v" + Version.MajorStr + "." + - Version.MinorStr, - InstallDir.str() + "/include/g++-v" + Version.MajorStr, -diff --git a/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/include/.keep b/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/include/.keep -new file mode 100644 -index 0000000..e69de29 -diff --git a/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/crtbegin.o b/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/crtbegin.o -new file mode 100644 -index 0000000..e69de29 -diff --git a/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3/.keep b/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3/.keep -new file mode 100644 -index 0000000..e69de29 -diff --git a/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/x86_64-pc-linux-gnu/lib/.keep b/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/x86_64-pc-linux-gnu/lib/.keep -new file mode 100644 -index 0000000..e69de29 -diff --git a/tools/clang/test/Driver/linux-header-search.cpp b/tools/clang/test/Driver/linux-header-search.cpp -index 9568bde..5f6ac50 100644 ---- a/tools/clang/test/Driver/linux-header-search.cpp -+++ b/tools/clang/test/Driver/linux-header-search.cpp -@@ -285,6 +285,21 @@ - // CHECK-GENTOO-4-6-4: "-internal-isystem" "[[RESOURCE_DIR]]{{/|\\\\}}include" - // CHECK-GENTOO-4-6-4: "-internal-externc-isystem" "[[SYSROOT]]/include" - // CHECK-GENTOO-4-6-4: "-internal-externc-isystem" "[[SYSROOT]]/usr/include" -+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ -+// RUN: -target x86_64-unknown-linux-gnu -stdlib=libstdc++ \ -+// RUN: --sysroot=%S/Inputs/gentoo_linux_gcc_4.9.3_tree \ -+// RUN: --gcc-toolchain="" \ -+// RUN: | FileCheck --check-prefix=CHECK-GENTOO-4-9-3 %s -+// CHECK-GENTOO-4-9-3: "{{.*}}clang{{.*}}" "-cc1" -+// CHECK-GENTOO-4-9-3: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]" -+// CHECK-GENTOO-4-9-3: "-isysroot" "[[SYSROOT:[^"]+]]" -+// CHECK-GENTOO-4-9-3: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3" -+// CHECK-GENTOO-4-9-3: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3/x86_64-pc-linux-gnu" -+// CHECK-GENTOO-4-9-3: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3/backward" -+// CHECK-GENTOO-4-9-3: "-internal-isystem" "[[SYSROOT]]/usr/local/include" -+// CHECK-GENTOO-4-9-3: "-internal-isystem" "[[RESOURCE_DIR]]{{/|\\\\}}include" -+// CHECK-GENTOO-4-9-3: "-internal-externc-isystem" "[[SYSROOT]]/include" -+// CHECK-GENTOO-4-9-3: "-internal-externc-isystem" "[[SYSROOT]]/usr/include" - // - // Check header search on Debian 6 / MIPS64 - // RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ diff --git a/sys-devel/llvm/files/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch b/sys-devel/llvm/files/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch deleted file mode 100644 index 3e57f0d..0000000 --- a/sys-devel/llvm/files/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2ec240a76253839cd1c5dc2e964f55698ae468fc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 8 Jun 2015 06:43:00 +0200 -Subject: [PATCH 2/4] cmake: Support overriding Sphinx HTML doc install - directory - -Provide ${PROJECT}_INSTALL_HTML variables (e.g. LLVM_INSTALL_HTML) to -override Sphinx HTML doc install directory. - -Fixes: https://llvm.org/bugs/show_bug.cgi?id=23780 ---- - cmake/modules/AddSphinxTarget.cmake | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake -index 045dc23..9c9c444 100644 ---- a/cmake/modules/AddSphinxTarget.cmake -+++ b/cmake/modules/AddSphinxTarget.cmake -@@ -53,8 +53,12 @@ function (add_sphinx_target builder project) - DESTINATION share/man/man1) - - elseif (builder STREQUAL html) -- install(DIRECTORY "${SPHINX_BUILD_DIR}" -- DESTINATION "share/doc/${project}") -+ string(TOUPPER "${project}" project_upper) -+ set(${project_upper}_INSTALL_HTML "share/doc/${project}/html" -+ CACHE STRING "HTML documentation install directory for ${project}") -+ -+ install(DIRECTORY "${SPHINX_BUILD_DIR}/" -+ DESTINATION "${${project_upper}_INSTALL_HTML}") - else() - message(WARNING Installation of ${builder} not supported) - endif() --- -2.4.3 - diff --git a/sys-devel/llvm/files/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch b/sys-devel/llvm/files/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch deleted file mode 100644 index b1c74c6..0000000 --- a/sys-devel/llvm/files/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4f7092ba05cccfeea7d26177d93f3d7a57d9bce2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 8 Jun 2015 14:29:03 +0200 -Subject: [PATCH 3/4] cmake: Add an ordering dep between HTML & man Sphinx - targets - -Add a dependency between HTML & manpage Sphinx targets to prevent two -instances of Sphinx from running in parallel, and therefore solves race -conditions reusing the same doctree directory. - -Fixes: https://llvm.org/bugs/show_bug.cgi?id=23781 ---- - docs/CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt -index da27627..63309a6 100644 ---- a/docs/CMakeLists.txt -+++ b/docs/CMakeLists.txt -@@ -100,6 +100,9 @@ if (LLVM_ENABLE_SPHINX) - - if (${SPHINX_OUTPUT_MAN}) - add_sphinx_target(man llvm) -+ if (${SPHINX_OUTPUT_HTML}) -+ add_dependencies(docs-llvm-html docs-llvm-man) -+ endif() - endif() - - endif() --- -2.4.3 - diff --git a/sys-devel/llvm/files/cmake/0004-cmake-Do-not-install-libgtest.patch b/sys-devel/llvm/files/cmake/0004-cmake-Do-not-install-libgtest.patch deleted file mode 100644 index 92ca2e4..0000000 --- a/sys-devel/llvm/files/cmake/0004-cmake-Do-not-install-libgtest.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d9f80393cfd4e586242ac3efd4e6ba6b49ce39ae Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Tue, 9 Jun 2015 11:58:52 +0200 -Subject: [PATCH 4/4] cmake: Do not install libgtest - -libgtest is an internal test dependency, and should not be installed to -the live system as a part of LLVM. ---- - utils/unittest/CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt -index b34e22a..3fe5884 100644 ---- a/utils/unittest/CMakeLists.txt -+++ b/utils/unittest/CMakeLists.txt -@@ -41,6 +41,9 @@ if (PTHREAD_LIBRARY_PATH) - list(APPEND LIBS pthread) - endif() - -+# Delay building until the tests pull it in, and avoid installing it -+set(EXCLUDE_FROM_ALL ON) -+ - add_llvm_library(gtest - googletest/src/gtest-all.cc - --- -2.4.3 - diff --git a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch b/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch deleted file mode 100644 index 931eb56..0000000 --- a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp -index fa7780f..e3a6c8f 100644 ---- a/tools/clang/lib/Driver/Driver.cpp -+++ b/tools/clang/lib/Driver/Driver.cpp -@@ -66,8 +66,7 @@ Driver::Driver(StringRef ClangExecutable, StringRef DefaultTargetTriple, - if (ClangResourceDir != "") { - llvm::sys::path::append(P, ClangResourceDir); - } else { -- StringRef ClangLibdirSuffix(CLANG_LIBDIR_SUFFIX); -- llvm::sys::path::append(P, "..", Twine("lib") + ClangLibdirSuffix, "clang", -+ llvm::sys::path::append(P, "..", "lib", "clang", - CLANG_VERSION_STRING); - } - ResourceDir = P.str(); -diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp -index f078b37..0c514fc 100644 ---- a/tools/clang/lib/Frontend/CompilerInvocation.cpp -+++ b/tools/clang/lib/Frontend/CompilerInvocation.cpp -@@ -1097,7 +1097,7 @@ std::string CompilerInvocation::GetResourcesPath(const char *Argv0, - if (ClangResourceDir != "") - llvm::sys::path::append(P, ClangResourceDir); - else -- llvm::sys::path::append(P, "..", Twine("lib") + CLANG_LIBDIR_SUFFIX, -+ llvm::sys::path::append(P, "..", "lib", - "clang", CLANG_VERSION_STRING); - - return P.str(); -diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt -index 7de5fbe..49f439b 100644 ---- a/tools/clang/lib/Headers/CMakeLists.txt -+++ b/tools/clang/lib/Headers/CMakeLists.txt -@@ -100,4 +100,4 @@ set_target_properties(clang-headers PROPERTIES FOLDER "Misc") - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) -+ DESTINATION lib/clang/${CLANG_VERSION}/include) diff --git a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch b/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch deleted file mode 100644 index 904a72a..0000000 --- a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b28503def986bcbc388a04be0d51cbe80bc59506 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Tue, 9 Jun 2015 12:11:50 +0200 -Subject: [PATCH] Install clang runtime into /usr/lib (without suffix) - ---- - lib/Driver/Driver.cpp | 3 +-- - lib/Frontend/CompilerInvocation.cpp | 3 +-- - lib/Headers/CMakeLists.txt | 2 +- - 3 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp -index a04a1f8..418d46a 100644 ---- a/tools/clang/lib/Driver/Driver.cpp -+++ b/tools/clang//lib/Driver/Driver.cpp -@@ -66,8 +66,7 @@ Driver::Driver(StringRef ClangExecutable, StringRef DefaultTargetTriple, - if (ClangResourceDir != "") { - llvm::sys::path::append(P, ClangResourceDir); - } else { -- StringRef ClangLibdirSuffix(CLANG_LIBDIR_SUFFIX); -- llvm::sys::path::append(P, "..", Twine("lib") + ClangLibdirSuffix, "clang", -+ llvm::sys::path::append(P, "..", "lib", "clang", - CLANG_VERSION_STRING); - } - ResourceDir = P.str(); -diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp -index 9485767..0b9ecbd 100644 ---- a/tools/clang/lib/Frontend/CompilerInvocation.cpp -+++ b/tools/clang/lib/Frontend/CompilerInvocation.cpp -@@ -1053,8 +1053,7 @@ std::string CompilerInvocation::GetResourcesPath(const char *Argv0, - if (ClangResourceDir != "") { - llvm::sys::path::append(P, ClangResourceDir); - } else { -- StringRef ClangLibdirSuffix(CLANG_LIBDIR_SUFFIX); -- llvm::sys::path::append(P, "..", Twine("lib") + ClangLibdirSuffix, "clang", -+ llvm::sys::path::append(P, "..", "lib", "clang", - CLANG_VERSION_STRING); - } - -diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt -index 29a738e..3769d23 100644 ---- a/tools/clang/lib/Headers/CMakeLists.txt -+++ b/tools/clang/lib/Headers/CMakeLists.txt -@@ -93,4 +93,4 @@ set_target_properties(clang-headers PROPERTIES FOLDER "Misc") - install( - FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) -+ DESTINATION lib/clang/${CLANG_VERSION}/include) --- -2.4.3 - diff --git a/sys-devel/llvm/files/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch b/sys-devel/llvm/files/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch deleted file mode 100644 index 0b93deb..0000000 --- a/sys-devel/llvm/files/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d07632abe23d55eec2aae303a142a97765a77d32 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Tue, 9 Jun 2015 12:20:06 +0200 -Subject: [PATCH 2/2] cmake: Make CLANG_LIBDIR_SUFFIX overridable - -Make CLANG_LIBDIR_SUFFIX a cache variable so that it can be explicitly -overriden. It is used purely to find the LLVMgold.so plugin, so we want -to set it to native suffix. ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 357286b..647f976 100644 ---- a/tools/clang/CMakeLists.txt -+++ b/tools/clang/CMakeLists.txt -@@ -203,7 +203,7 @@ set(CLANG_VENDOR_UTI "org.llvm.clang" CACHE STRING - "Vendor-specific uti.") - - # The libdir suffix must exactly match whatever LLVM's configuration used. --set(CLANG_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}") -+set(CLANG_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}" CACHE STRING "") - - set(CLANG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - set(CLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) --- -2.4.3 - diff --git a/sys-devel/llvm/files/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch b/sys-devel/llvm/files/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch deleted file mode 100644 index 9353800..0000000 --- a/sys-devel/llvm/files/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8bd62a681744d3c31a0837c0f84f99ea4987e017 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Tue, 9 Jun 2015 12:17:57 +0200 -Subject: [PATCH] cmake: Install compiler-rt into /usr/lib (without suffix) - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0d8a880..5ae98a9 100644 ---- a/projects/compiler-rt/CMakeLists.txt -+++ b/projects/compiler-rt/CMakeLists.txt -@@ -52,7 +52,7 @@ if (NOT COMPILER_RT_STANDALONE_BUILD) - # Setup the paths where compiler-rt runtimes and headers should be stored. - set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}) - set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) -- set(COMPILER_RT_INSTALL_PATH lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}) -+ set(COMPILER_RT_INSTALL_PATH lib/clang/${CLANG_VERSION}) - option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." - ${LLVM_INCLUDE_TESTS}) - option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" --- -2.4.3 - diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch deleted file mode 100644 index 943a840..0000000 --- a/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur llvm-3.7.0.src.orig/projects/compiler-rt/cmake/config-ix.cmake llvm-3.7.0.src/projects/compiler-rt/cmake/config-ix.cmake ---- llvm-3.7.0.src.orig/projects/compiler-rt/cmake/config-ix.cmake 2015-07-30 06:28:50.000000000 +0200 -+++ llvm-3.7.0.src/projects/compiler-rt/cmake/config-ix.cmake 2015-10-27 17:10:47.365847079 +0100 -@@ -209,12 +209,6 @@ - test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu") - test_target_arch(mips64 "" "-mips64r2" "-mabi=n64") - endif() -- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "arm") -- test_target_arch(arm "" "-march=armv7-a") -- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch32") -- test_target_arch(aarch32 "" "-march=armv8-a") -- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch64") -- test_target_arch(aarch64 "" "-march=armv8-a") - endif() - set(COMPILER_RT_OS_SUFFIX "") - endif() diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch deleted file mode 100644 index 626498c..0000000 --- a/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/tools/lldb/cmake/LLDBDependencies.cmake 2015/09/16 20:13:53 247841 -+++ b/tools/lldb/cmake/LLDBDependencies.cmake 2015/09/16 20:14:01 247842 -@@ -141,6 +141,9 @@ - endif() - if (NOT LLDB_DISABLE_CURSES) - list(APPEND LLDB_SYSTEM_LIBS panel ncurses) -+ if(LLVM_ENABLE_TERMINFO AND HAVE_TERMINFO) -+ list(APPEND LLDB_SYSTEM_LIBS ${TERMINFO_LIBS}) -+ endif() - endif() - endif() - # On FreeBSD backtrace() is provided by libexecinfo, not libc. diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch deleted file mode 100644 index d53ce19..0000000 --- a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur llvm-3.7.0.src.orig/docs/CMakeLists.txt llvm-3.7.0.src/docs/CMakeLists.txt ---- llvm-3.7.0.src.orig/docs/CMakeLists.txt 2015-08-18 18:48:44.000000000 +0200 -+++ llvm-3.7.0.src/docs/CMakeLists.txt 2015-10-12 14:40:00.985384589 +0200 -@@ -115,7 +115,7 @@ - endif() - - list(FIND LLVM_BINDINGS_LIST ocaml uses_ocaml) --if( NOT uses_ocaml LESS 0 ) -+if( NOT uses_ocaml LESS 0 AND LLVM_BUILD_DOCS ) - set(doc_targets - ocaml_llvm - ocaml_llvm_all_backends diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch deleted file mode 100644 index 024bad7..0000000 --- a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- llvm-3.7.0rc3.src-orig/cmake/modules/AddOCaml.cmake 2015-06-08 05:22:22.000000000 +1000 -+++ llvm-3.7.0rc3.src/cmake/modules/AddOCaml.cmake 2015-08-30 19:22:37.216580808 +1000 -@@ -131,7 +131,7 @@ - if( APPLE ) - set(ocaml_rpath "@executable_path/../../lib") - elseif( UNIX ) -- set(ocaml_rpath "\\$ORIGIN/../../lib") -+ set(ocaml_rpath "\\$ORIGIN/../../${CMAKE_INSTALL_LIBDIR}") - endif() - list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") - -@@ -183,12 +183,12 @@ - endforeach() - - install(FILES ${install_files} -- DESTINATION lib/ocaml) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) - install(FILES ${install_shlibs} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE -- DESTINATION lib/ocaml) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) - - foreach( install_file ${install_files} ${install_shlibs} ) - get_filename_component(filename "${install_file}" NAME) ---- llvm-3.7.0rc3.src-orig/bindings/ocaml/backends/CMakeLists.txt 2014-12-30 14:24:07.000000000 +1100 -+++ llvm-3.7.0rc3.src/bindings/ocaml/backends/CMakeLists.txt 2015-08-30 19:23:49.726583886 +1000 -@@ -23,5 +23,5 @@ - "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}") - - install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}" -- DESTINATION lib/ocaml) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) - endforeach() ---- llvm-3.7.0rc3.src-orig/bindings/ocaml/llvm/CMakeLists.txt 2014-12-30 14:24:07.000000000 +1100 -+++ llvm-3.7.0rc3.src/bindings/ocaml/llvm/CMakeLists.txt 2015-08-30 19:23:43.561583624 +1000 -@@ -8,4 +8,4 @@ - "${LLVM_LIBRARY_DIR}/ocaml/META.llvm") - - install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm" -- DESTINATION lib/ocaml) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) diff --git a/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch b/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch deleted file mode 100644 index e42c08a..0000000 --- a/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/CMakeLists.txt 2015-08-12 20:04:55.397881480 +0200 -+++ b/CMakeLists.txt 2015-08-12 20:05:06.625741113 +0200 -@@ -152,11 +152,6 @@ - - string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) - --if (CMAKE_BUILD_TYPE AND -- NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$") -- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") --endif() -- - set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) - - # They are used as destination of target generators. diff --git a/sys-devel/llvm/files/cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch b/sys-devel/llvm/files/cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch deleted file mode 100644 index d82236e..0000000 --- a/sys-devel/llvm/files/cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur llvm-3.8.0rc1.src.orig/projects/compiler-rt/cmake/config-ix.cmake llvm-3.8.0rc1.src/projects/compiler-rt/cmake/config-ix.cmake ---- llvm-3.8.0rc1.src.orig/projects/compiler-rt/cmake/config-ix.cmake 2016-01-13 17:56:15.000000000 +0100 -+++ llvm-3.8.0rc1.src/projects/compiler-rt/cmake/config-ix.cmake 2016-01-27 19:43:21.265315207 +0100 -@@ -219,13 +219,6 @@ - elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "mips") - test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu") - test_target_arch(mips64 "" "-mips64r2" "--target=mips64-linux-gnu" "-mabi=n64") -- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "arm") -- test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft") -- test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard") -- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32") -- test_target_arch(aarch32 "" "-march=armv8-a") -- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch64") -- test_target_arch(aarch64 "" "-march=armv8-a") - elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "wasm32") - test_target_arch(wasm32 "" "--target=wasm32-unknown-unknown") - elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "wasm64") diff --git a/sys-devel/llvm/files/compiler-rt-3.7-msan-fix.patch b/sys-devel/llvm/files/compiler-rt-3.7-msan-fix.patch deleted file mode 100644 index 3854a18..0000000 --- a/sys-devel/llvm/files/compiler-rt-3.7-msan-fix.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 5dad120f9c9bc74c73edadb0467d8df81ae46066 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" <hjl.tools@gmail.com> -Date: Wed, 5 Aug 2015 05:34:27 -0700 -Subject: [PATCH 08/13] Apply split-layout-compiler-rt.patch - -https://llvm.org/bugs/show_bug.cgi?id=24155 ---- - lib/msan/msan.h | 30 ++++++++++++++++++++---------- - lib/msan/msan_allocator.cc | 12 +++++++++++- - 2 files changed, 31 insertions(+), 11 deletions(-) - -diff --git a/lib/msan/msan.h b/lib/msan/msan.h -index cd8bc19..6251b38 100644 ---- a/lib/msan/msan.h -+++ b/lib/msan/msan.h -@@ -94,17 +94,27 @@ const MappingDesc kMemoryLayout[] = { - - #elif SANITIZER_LINUX && SANITIZER_WORDSIZE == 64 - --// Requries PIE binary and ASLR enabled. --// Main thread stack and DSOs at 0x7f0000000000 (sometimes 0x7e0000000000). --// Heap at 0x600000000000. -+// All of the following configurations are supported. -+// ASLR disabled: main executable and DSOs at 0x555550000000 -+// PIE and ASLR: main executable and DSOs at 0x7f0000000000 -+// non-PIE: main executable below 0x100000000, DSOs at 0x7f0000000000 -+// Heap at 0x700000000000. - const MappingDesc kMemoryLayout[] = { -- {0x000000000000ULL, 0x200000000000ULL, MappingDesc::INVALID, "invalid"}, -- {0x200000000000ULL, 0x400000000000ULL, MappingDesc::SHADOW, "shadow"}, -- {0x400000000000ULL, 0x600000000000ULL, MappingDesc::ORIGIN, "origin"}, -- {0x600000000000ULL, 0x800000000000ULL, MappingDesc::APP, "app"}}; -- --#define MEM_TO_SHADOW(mem) (((uptr)(mem)) & ~0x400000000000ULL) --#define SHADOW_TO_ORIGIN(mem) (((uptr)(mem)) + 0x200000000000ULL) -+ {0x000000000000ULL, 0x050000000000ULL, MappingDesc::APP, "app-1"}, -+ {0x050000000000ULL, 0x100000000000ULL, MappingDesc::SHADOW, "shadow-2"}, -+ {0x100000000000ULL, 0x150000000000ULL, MappingDesc::INVALID, "invalid"}, -+ {0x150000000000ULL, 0x200000000000ULL, MappingDesc::ORIGIN, "origin-2"}, -+ {0x200000000000ULL, 0x300000000000ULL, MappingDesc::SHADOW, "shadow-3"}, -+ {0x300000000000ULL, 0x400000000000ULL, MappingDesc::ORIGIN, "origin-3"}, -+ {0x400000000000ULL, 0x500000000000ULL, MappingDesc::INVALID, "invalid"}, -+ {0x500000000000ULL, 0x550000000000ULL, MappingDesc::SHADOW, "shadow-1"}, -+ {0x550000000000ULL, 0x600000000000ULL, MappingDesc::APP, "app-2"}, -+ {0x600000000000ULL, 0x650000000000ULL, MappingDesc::ORIGIN, "origin-1"}, -+ {0x650000000000ULL, 0x700000000000ULL, MappingDesc::INVALID, "invalid"}, -+ {0x700000000000ULL, 0x800000000000ULL, MappingDesc::APP, "app-3"}}; -+ -+#define MEM_TO_SHADOW(mem) (((uptr)(mem)) ^ 0x500000000000ULL) -+#define SHADOW_TO_ORIGIN(mem) (((uptr)(mem)) + 0x100000000000ULL) - - #else - #error "Unsupported platform" -diff --git a/lib/msan/msan_allocator.cc b/lib/msan/msan_allocator.cc -index 6df3566..e588bf8 100644 ---- a/lib/msan/msan_allocator.cc -+++ b/lib/msan/msan_allocator.cc -@@ -49,7 +49,8 @@ struct MsanMapUnmapCallback { - typedef SizeClassAllocator32<0, SANITIZER_MMAP_RANGE_SIZE, sizeof(Metadata), - SizeClassMap, kRegionSizeLog, ByteMap, - MsanMapUnmapCallback> PrimaryAllocator; --#elif defined(__x86_64__) -+ -+#elif SANITIZER_FREEBSD && SANITIZER_WORDSIZE == 64 - static const uptr kAllocatorSpace = 0x600000000000ULL; - static const uptr kAllocatorSize = 0x80000000000; // 8T. - static const uptr kMetadataSize = sizeof(Metadata); -@@ -67,6 +68,15 @@ struct MsanMapUnmapCallback { - typedef SizeClassAllocator64<kAllocatorSpace, kAllocatorSize, kMetadataSize, - DefaultSizeClassMap, - MsanMapUnmapCallback> PrimaryAllocator; -+#elif SANITIZER_LINUX && SANITIZER_WORDSIZE == 64 -+ static const uptr kAllocatorSpace = 0x700000000000ULL; -+ static const uptr kAllocatorSize = 0x80000000000; // 8T. -+ static const uptr kMetadataSize = sizeof(Metadata); -+ static const uptr kMaxAllowedMallocSize = 8UL << 30; -+ -+ typedef SizeClassAllocator64<kAllocatorSpace, kAllocatorSize, kMetadataSize, -+ DefaultSizeClassMap, -+ MsanMapUnmapCallback> PrimaryAllocator; - #endif - typedef SizeClassAllocatorLocalCache<PrimaryAllocator> AllocatorCache; - typedef LargeMmapAllocator<MsanMapUnmapCallback> SecondaryAllocator; --- -2.6.4 - diff --git a/sys-devel/llvm/files/llvm-2.6-commandguide-nops.patch b/sys-devel/llvm/files/llvm-2.6-commandguide-nops.patch deleted file mode 100644 index 583fdf9..0000000 --- a/sys-devel/llvm/files/llvm-2.6-commandguide-nops.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- docs/CommandGuide/Makefile.orig 2009-10-26 16:54:33.000000000 +0100 -+++ docs/CommandGuide/Makefile 2009-10-26 17:32:03.000000000 +0100 -@@ -19,7 +19,7 @@ - DST_PS_DIR=ps/ - - # If we are in BUILD_FOR_WEBSITE mode, default to the all target. --all:: html man ps -+all:: html man - - clean: - rm -f pod2htm*.*~~ $(HTML) $(MAN) $(PS) -@@ -81,7 +81,7 @@ - MAN_DIR := $(PROJ_mandir)/man1 - PS_DIR := $(PROJ_docsdir)/ps - --install-local:: $(HTML) $(INSTALL_MANS) $(PS) -+install-local:: $(HTML) $(INSTALL_MANS) - $(Echo) Installing HTML CommandGuide Documentation - $(Verb) $(MKDIR) $(HTML_DIR) - $(Verb) $(DataInstall) $(HTML) $(HTML_DIR) -@@ -90,9 +90,6 @@ - $(Echo) Installing MAN CommandGuide Documentation - $(Verb) $(MKDIR) $(MAN_DIR) - $(Verb) $(DataInstall) $(INSTALL_MANS) $(MAN_DIR) -- $(Echo) Installing PS CommandGuide Documentation -- $(Verb) $(MKDIR) $(PS_DIR) -- $(Verb) $(DataInstall) $(PS) $(PS_DIR) - - uninstall-local:: - $(Echo) Uninstalling CommandGuide Documentation diff --git a/sys-devel/llvm/files/llvm-2.7-nodoctargz.patch b/sys-devel/llvm/files/llvm-2.7-nodoctargz.patch deleted file mode 100644 index cce09eb..0000000 --- a/sys-devel/llvm/files/llvm-2.7-nodoctargz.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- docs/Makefile.orig 2010-04-26 15:00:58.000000000 +0200 -+++ docs/Makefile 2010-04-26 15:03:12.000000000 +0200 -@@ -46,13 +46,12 @@ - # 'make generated BUILD_FOR_WEBSITE=1' - generated:: doxygen ocamldoc - --install-html: $(PROJ_OBJ_DIR)/html.tar.gz -+install-html: - $(Echo) Installing HTML documentation - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img - $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html - $(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir) - - $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) - $(Echo) Packaging HTML documentation -@@ -64,12 +63,11 @@ - install-doxygen: doxygen - $(Echo) Installing doxygen documentation - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) - $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \ - $(FIND) . -type f -exec \ - $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \; - --doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz -+doxygen: regendoc - - regendoc: - $(Echo) Building doxygen documentation -@@ -95,7 +93,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 \; -@@ -105,7 +102,6 @@ - $(Verb) $(RM) -rf $(PROJ_OBJ_DIR)/ocamldoc.tar* - $(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/ocamldoc.tar ocamldoc - $(Verb) $(GZIP) $(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/files/llvm-2.8-alignof.patch b/sys-devel/llvm/files/llvm-2.8-alignof.patch deleted file mode 100644 index ae7f314..0000000 --- a/sys-devel/llvm/files/llvm-2.8-alignof.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: include/llvm/ADT/StringMap.h -=================================================================== ---- include/llvm/ADT/StringMap.h (révision 117773) -+++ include/llvm/ADT/StringMap.h (révision 117774) -@@ -167,7 +167,7 @@ - - unsigned AllocSize = static_cast<unsigned>(sizeof(StringMapEntry))+ - KeyLength+1; -- unsigned Alignment = alignof<StringMapEntry>(); -+ unsigned Alignment = alignOf<StringMapEntry>(); - - StringMapEntry *NewItem = - static_cast<StringMapEntry*>(Allocator.Allocate(AllocSize,Alignment)); -Index: include/llvm/Support/AlignOf.h -=================================================================== ---- include/llvm/Support/AlignOf.h (révision 117773) -+++ include/llvm/Support/AlignOf.h (révision 117774) -@@ -49,12 +49,12 @@ - - }; - --/// alignof - A templated function that returns the mininum alignment of -+/// alignOf - A templated function that returns the mininum alignment of - /// of a type. This provides no extra functionality beyond the AlignOf - /// class besides some cosmetic cleanliness. Example usage: --/// alignof<int>() returns the alignment of an int. -+/// alignOf<int>() returns the alignment of an int. - template <typename T> --static inline unsigned alignof() { return AlignOf<T>::Alignment; } -+static inline unsigned alignOf() { return AlignOf<T>::Alignment; } - - } // end namespace llvm - #endif -Index: include/llvm/Support/Allocator.h -=================================================================== ---- include/llvm/Support/Allocator.h (révision 117773) -+++ include/llvm/Support/Allocator.h (révision 117774) -@@ -201,7 +201,7 @@ - char *End = Slab == Allocator.CurSlab ? Allocator.CurPtr : - (char *)Slab + Slab->Size; - for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) { -- Ptr = Allocator.AlignPtr(Ptr, alignof<T>()); -+ Ptr = Allocator.AlignPtr(Ptr, alignOf<T>()); - if (Ptr + sizeof(T) <= End) - reinterpret_cast<T*>(Ptr)->~T(); - } -Index: include/llvm/CodeGen/SlotIndexes.h -=================================================================== ---- include/llvm/CodeGen/SlotIndexes.h (révision 117773) -+++ include/llvm/CodeGen/SlotIndexes.h (révision 117774) -@@ -393,7 +393,7 @@ - IndexListEntry *entry = - static_cast<IndexListEntry*>( - ileAllocator.Allocate(sizeof(IndexListEntry), -- alignof<IndexListEntry>())); -+ alignOf<IndexListEntry>())); - - new (entry) IndexListEntry(mi, index); - diff --git a/sys-devel/llvm/files/llvm-2.8-darwin8.patch b/sys-devel/llvm/files/llvm-2.8-darwin8.patch deleted file mode 100644 index 284ab47..0000000 --- a/sys-devel/llvm/files/llvm-2.8-darwin8.patch +++ /dev/null @@ -1,15 +0,0 @@ -Avoid like in Makefile.rules -ld: -rpath can only be used when targeting Mac OS X 10.5 or later - ---- unittests/Makefile.unittest -+++ unittests/Makefile.unittest -@@ -37,7 +37,9 @@ - ifeq ($(ENABLE_SHARED), 1) - # Add the absolute path to the dynamic library. This is ok because - # we'll never install unittests. -+ifneq ($(DARWIN_MAJVERS),4) - LD.Flags += $(RPATH) -Wl,$(SharedLibDir) -+endif - # Also set {DYLD,LD}_LIBRARY_PATH because OSX ignores the rpath most - # of the time. - Run.Shared := $(SHLIBPATH_VAR)="$(SharedLibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" diff --git a/sys-devel/llvm/files/llvm-2.9-Operator.h-c++0x.patch b/sys-devel/llvm/files/llvm-2.9-Operator.h-c++0x.patch deleted file mode 100644 index b95d7d7..0000000 --- a/sys-devel/llvm/files/llvm-2.9-Operator.h-c++0x.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- llvm/trunk/include/llvm/Operator.h 2011/02/07 16:40:21 125006 -+++ llvm/trunk/include/llvm/Operator.h 2011/05/08 01:59:22 131062 -@@ -186,28 +186,46 @@ - }; - - class AddOperator -- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {}; -+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> { -+ ~AddOperator(); // DO NOT IMPLEMENT -+}; - class SubOperator -- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {}; -+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> { -+ ~SubOperator(); // DO NOT IMPLEMENT -+}; - class MulOperator -- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {}; -+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> { -+ ~MulOperator(); // DO NOT IMPLEMENT -+}; - class ShlOperator -- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {}; -+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> { -+ ~ShlOperator(); // DO NOT IMPLEMENT -+}; - - - class SDivOperator -- : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {}; -+ : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> { -+ ~SDivOperator(); // DO NOT IMPLEMENT -+}; - class UDivOperator -- : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {}; -+ : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> { -+ ~UDivOperator(); // DO NOT IMPLEMENT -+}; - class AShrOperator -- : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {}; -+ : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> { -+ ~AShrOperator(); // DO NOT IMPLEMENT -+}; - class LShrOperator -- : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {}; -+ : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> { -+ ~LShrOperator(); // DO NOT IMPLEMENT -+}; - - - - class GEPOperator - : public ConcreteOperator<Operator, Instruction::GetElementPtr> { -+ ~GEPOperator(); // DO NOT IMPLEMENT -+ - enum { - IsInBounds = (1 << 0) - }; diff --git a/sys-devel/llvm/files/llvm-2.9-gcc4.7.patch b/sys-devel/llvm/files/llvm-2.9-gcc4.7.patch deleted file mode 100644 index a48ad96..0000000 --- a/sys-devel/llvm/files/llvm-2.9-gcc4.7.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- - Intercept.cpp | 1 + - 1 file changed, 1 insertion(+) - ---- a/lib/ExecutionEngine/JIT/Intercept.cpp 2012-05-17 16:11:46.956180361 +0200 -+++ b/lib/ExecutionEngine/JIT/Intercept.cpp 2012-05-17 16:14:35.256184996 +0200 -@@ -52,6 +52,7 @@ - #include <sys/stat.h> - #endif - #include <fcntl.h> -+#include <unistd.h> - /* stat functions are redirecting to __xstat with a version number. On x86-64 - * linking with libc_nonshared.a and -Wl,--export-dynamic doesn't make 'stat' - * available as an exported symbol, so we have to add it explicitly. diff --git a/sys-devel/llvm/files/llvm-2.9-nodoctargz.patch b/sys-devel/llvm/files/llvm-2.9-nodoctargz.patch deleted file mode 100644 index 9507817..0000000 --- a/sys-devel/llvm/files/llvm-2.9-nodoctargz.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- docs/Makefile.orig 2011-02-28 21:30:46.000000000 +0100 -+++ docs/Makefile 2011-02-28 21:35:22.000000000 +0100 -@@ -53,13 +53,12 @@ - # '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) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img - $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html - $(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir) - - $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) - $(Echo) Packaging HTML documentation -@@ -71,12 +70,11 @@ - install-doxygen: doxygen - $(Echo) Installing doxygen documentation - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) - $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \ - $(FIND) . -type f -exec \ - $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \; - --doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz -+doxygen: regendoc - - regendoc: - $(Echo) Building doxygen documentation -@@ -102,7 +100,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 \; diff --git a/sys-devel/llvm/files/llvm-3.0-PPCCompilationCallbackC_static.patch b/sys-devel/llvm/files/llvm-3.0-PPCCompilationCallbackC_static.patch deleted file mode 100644 index 04e4024..0000000 --- a/sys-devel/llvm/files/llvm-3.0-PPCCompilationCallbackC_static.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=403519 -http://llvm.org/viewvc/llvm-project?view=rev&revision=153938 - ---- llvm/trunk/lib/Target/PowerPC/PPCJITInfo.cpp 2011/06/15 15:29:47 133059 -+++ llvm/trunk/lib/Target/PowerPC/PPCJITInfo.cpp 2012/04/03 06:59:28 153938 -@@ -291,9 +291,10 @@ - } - #endif - --extern "C" void *PPCCompilationCallbackC(unsigned *StubCallAddrPlus4, -- unsigned *OrigCallAddrPlus4, -- bool is64Bit) { -+extern "C" { -+static void* LLVM_ATTRIBUTE_USED PPCCompilationCallbackC(unsigned *StubCallAddrPlus4, -+ unsigned *OrigCallAddrPlus4, -+ bool is64Bit) { - // Adjust the pointer to the address of the call instruction in the stub - // emitted by emitFunctionStub, rather than the instruction after it. - unsigned *StubCallAddr = StubCallAddrPlus4 - 1; -@@ -337,6 +338,7 @@ - // stack after we restore all regs. - return Target; - } -+} - - - diff --git a/sys-devel/llvm/files/llvm-3.0-PPC_macro.patch b/sys-devel/llvm/files/llvm-3.0-PPC_macro.patch deleted file mode 100644 index c485e9b..0000000 --- a/sys-devel/llvm/files/llvm-3.0-PPC_macro.patch +++ /dev/null @@ -1,43 +0,0 @@ -Index: llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h -=================================================================== ---- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h 2011-07-25 23:24:55.000000000 +0000 -+++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h 2011-12-02 13:06:48.000000000 +0000 -@@ -34,6 +34,10 @@ - - } // End llvm namespace - -+// Generated files will use "namespace PPC". To avoid symbol clash, -+// undefine PPC here. PPC may be predefined on some hosts. -+#undef PPC -+ - // Defines symbolic names for PowerPC registers. This defines a mapping from - // register name to register number. - // -Index: llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h -=================================================================== ---- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h 2011-07-26 00:24:13.000000000 +0000 -+++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h 2011-12-02 13:06:48.000000000 +0000 -@@ -14,6 +14,10 @@ - #ifndef LLVM_TARGET_POWERPC_PPCPREDICATES_H - #define LLVM_TARGET_POWERPC_PPCPREDICATES_H - -+// Generated files will use "namespace PPC". To avoid symbol clash, -+// undefine PPC here. PPC may be predefined on some hosts. -+#undef PPC -+ - namespace llvm { - namespace PPC { - /// Predicate - These are "(BI << 5) | BO" for various predicates. -Index: llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h -=================================================================== ---- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h 2011-07-25 19:53:23.000000000 +0000 -+++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h 2011-12-02 16:21:23.000000000 +0000 -@@ -12,6 +12,8 @@ - - #include "llvm/MC/MCFixup.h" - -+#undef PPC -+ - namespace llvm { - namespace PPC { - enum Fixups { diff --git a/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch b/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch deleted file mode 100644 index 031448d..0000000 --- a/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/gold/Makefile 2011/11/23 03:03:21 145094 -+++ tools/gold/Makefile 2011/11/23 03:07:25 145095 -@@ -24,6 +24,6 @@ - # Because off_t is used in the public API, the largefile parts are required for - # ABI compatibility. - CXXFLAGS+=-I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 --CXXFLAGS+=$(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT) -+CXXFLAGS+=-L$(SharedLibDir)/$(SharedPrefix) -lLTO - - include $(LEVEL)/Makefile.common diff --git a/sys-devel/llvm/files/llvm-3.0-ocaml_install.patch b/sys-devel/llvm/files/llvm-3.0-ocaml_install.patch deleted file mode 100644 index 18f5cf6..0000000 --- a/sys-devel/llvm/files/llvm-3.0-ocaml_install.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=393023 -http://llvm.org/bugs/show_bug.cgi?id=11177 - -Index: llvm-3.0-3.0/bindings/ocaml/llvm/Makefile -=================================================================== ---- llvm-3.0-3.0.orig/bindings/ocaml/llvm/Makefile 2011-11-15 12:17:02.785987852 +0100 -+++ llvm-3.0-3.0/bindings/ocaml/llvm/Makefile 2011-11-15 12:20:12.661983615 +0100 -@@ -30,7 +30,7 @@ - $(OcamlDir)/META.llvm: META.llvm - $(Verb) $(CP) -f $< $@ - --install-meta:: $(ObjDir)/META.llvm -+install-meta:: $(ObjDir)/../META.llvm - $(Echo) "Install $(BuildMode) $(DestMETA)" - $(Verb) $(MKDIR) $(PROJ_libocamldir) - $(Verb) $(DataInstall) META.llvm "$(DestMETA)" diff --git a/sys-devel/llvm/files/llvm-3.0-set_soname.patch b/sys-devel/llvm/files/llvm-3.0-set_soname.patch deleted file mode 100644 index 69ba74d..0000000 --- a/sys-devel/llvm/files/llvm-3.0-set_soname.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=409267 -http://llvm.org/bugs/show_bug.cgi?id=12334 ---- tools/llvm-shlib/Makefile.orig 2012-03-26 18:14:13.071797115 +0200 -+++ tools/llvm-shlib/Makefile 2012-03-26 17:31:12.491196254 +0200 -@@ -67,6 +67,7 @@ - # Include everything from the .a's into the shared library. - LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \ - -Wl,--no-whole-archive -+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) - endif - - ifeq ($(HOST_OS),Linux) diff --git a/sys-devel/llvm/files/llvm-3.1-ExecutionEngine_tests_xfail_arm.patch b/sys-devel/llvm/files/llvm-3.1-ExecutionEngine_tests_xfail_arm.patch deleted file mode 100644 index 05a20e6..0000000 --- a/sys-devel/llvm/files/llvm-3.1-ExecutionEngine_tests_xfail_arm.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur llvm-3.1.src/test/ExecutionEngine/2002-12-16-ArgTest.ll llvm.src/test/ExecutionEngine/2002-12-16-ArgTest.ll ---- llvm-3.1.src/test/ExecutionEngine/2002-12-16-ArgTest.ll 2012-04-12 22:13:57.000000000 +0200 -+++ llvm.src/test/ExecutionEngine/2002-12-16-ArgTest.ll 2012-10-08 15:06:30.000000000 +0200 -@@ -1,4 +1,5 @@ - ; RUN: %lli %s > /dev/null -+; XFAIL: arm - - @.LC0 = internal global [10 x i8] c"argc: %d\0A\00" ; <[10 x i8]*> [#uses=1] - -diff -Naur llvm-3.1.src/test/ExecutionEngine/test-fp-no-external-funcs.ll llvm.src/test/ExecutionEngine/test-fp-no-external-funcs.ll ---- llvm-3.1.src/test/ExecutionEngine/test-fp-no-external-funcs.ll 2012-04-12 22:13:57.000000000 +0200 -+++ llvm.src/test/ExecutionEngine/test-fp-no-external-funcs.ll 2012-10-08 15:06:30.000000000 +0200 -@@ -1,4 +1,5 @@ - ; RUN: %lli %s > /dev/null -+; XFAIL: arm - - define double @test(double* %DP, double %Arg) { - %D = load double* %DP ; <double> [#uses=1] -diff -Naur llvm-3.1.src/test/ExecutionEngine/test-fp.ll llvm.src/test/ExecutionEngine/test-fp.ll ---- llvm-3.1.src/test/ExecutionEngine/test-fp.ll 2012-04-12 22:13:57.000000000 +0200 -+++ llvm.src/test/ExecutionEngine/test-fp.ll 2012-10-08 15:06:30.000000000 +0200 -@@ -1,4 +1,5 @@ - ; RUN: %lli %s > /dev/null -+; XFAIL: arm - - define double @test(double* %DP, double %Arg) { - %D = load double* %DP ; <double> [#uses=1] diff --git a/sys-devel/llvm/files/llvm-3.1-docs-pod-markup-fixes.patch b/sys-devel/llvm/files/llvm-3.1-docs-pod-markup-fixes.patch deleted file mode 100644 index cd8a62a..0000000 --- a/sys-devel/llvm/files/llvm-3.1-docs-pod-markup-fixes.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- llvm-3.1.src/docs/CommandGuide/lit.pod~ 2012-03-27 03:01:14.000000000 +0900 -+++ llvm-3.1.src/docs/CommandGuide/lit.pod 2013-01-23 12:47:30.297510832 +0900 -@@ -386,8 +386,6 @@ - ******************** - PASS: D (4 of 4) - --=back -- - =head2 LIT EXAMPLE TESTS - - The B<lit> distribution contains several example implementations of test suites ---- llvm-3.1.src/docs/CommandGuide/llvm-cov.pod~ 2011-11-29 08:39:25.000000000 +0900 -+++ llvm-3.1.src/docs/CommandGuide/llvm-cov.pod 2013-01-23 13:44:32.184212441 +0900 -@@ -18,12 +18,12 @@ - - =over - --=item B<-gcno=filename] -+=item B<-gcno=filename> - - This option selects input description file generated by compiler while instrumenting - program. - --=item B<-gcda=filename] -+=item B<-gcda=filename> - - This option selects coverage data file generated by instrumented compiler. - diff --git a/sys-devel/llvm/files/llvm-3.1-fix_debug_line_info.patch b/sys-devel/llvm/files/llvm-3.1-fix_debug_line_info.patch deleted file mode 100644 index de2d46b..0000000 --- a/sys-devel/llvm/files/llvm-3.1-fix_debug_line_info.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 737fdba46f2b2b7d39bc728d15ea2334c44779e0 Mon Sep 17 00:00:00 2001 -From: Ben Longbons <b.r.longbons@gmail.com> -Date: Fri, 29 Jun 2012 12:58:34 -0700 -Subject: [PATCH] Revert "Patch to set is_stmt a little better for prologue - lines in a function." - -This meants that the debugger could find meaningful line information. - -This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850. ---- - lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 7 ++----- - test/DebugInfo/X86/ending-run.ll | 6 ++---- - 2 files changed, 4 insertions(+), 9 deletions(-) - -diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -index 3e79a6d..24aedfb 100644 ---- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -@@ -1093,15 +1093,12 @@ void DwarfDebug::beginInstruction(const MachineInstr *MI) { - if (!MI->isDebugValue()) { - DebugLoc DL = MI->getDebugLoc(); - if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) { -- unsigned Flags = 0; -+ unsigned Flags = DWARF2_FLAG_IS_STMT; - PrevInstLoc = DL; - if (DL == PrologEndLoc) { - Flags |= DWARF2_FLAG_PROLOGUE_END; - PrologEndLoc = DebugLoc(); - } -- if (PrologEndLoc.isUnknown()) -- Flags |= DWARF2_FLAG_IS_STMT; -- - if (!DL.isUnknown()) { - const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext()); - recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags); -@@ -1382,7 +1379,7 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) { - MF->getFunction()->getContext()); - recordSourceLine(FnStartDL.getLine(), FnStartDL.getCol(), - FnStartDL.getScope(MF->getFunction()->getContext()), -- 0); -+ DWARF2_FLAG_IS_STMT); - } - } - -diff --git a/test/DebugInfo/X86/ending-run.ll b/test/DebugInfo/X86/ending-run.ll -index 6935c47..0cd3de1 100644 ---- a/test/DebugInfo/X86/ending-run.ll -+++ b/test/DebugInfo/X86/ending-run.ll -@@ -1,11 +1,9 @@ - ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj - ; RUN: llvm-dwarfdump %t | FileCheck %s - --; Check that the line table starts at 7, not 4, but that the first --; statement isn't until line 8. -+; Check that the line table starts at 7, not 4. - --; CHECK-NOT: 0x0000000000000000 7 0 1 0 is_stmt --; CHECK: 0x0000000000000000 7 0 1 0 -+; CHECK: 0x0000000000000000 7 0 1 0 is_stmt - ; CHECK: 0x0000000000000004 8 18 1 0 is_stmt prologue_end - - define i32 @callee(i32 %x) nounwind uwtable ssp { --- -1.7.10 - diff --git a/sys-devel/llvm/files/llvm-3.1-ivybridge_support.patch b/sys-devel/llvm/files/llvm-3.1-ivybridge_support.patch deleted file mode 100644 index a03ec42..0000000 --- a/sys-devel/llvm/files/llvm-3.1-ivybridge_support.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- llvm/trunk/lib/Support/Host.cpp 2012/04/23 22:22:46 155401 -+++ llvm/trunk/lib/Support/Host.cpp 2012/04/23 22:41:39 155402 -@@ -230,6 +230,10 @@ - case 45: - return "corei7-avx"; - -+ // Ivy Bridge: -+ case 58: -+ return "core-avx-i"; -+ - case 28: // Intel Atom processor. All processors are manufactured using - // the 45 nm process - return "atom"; diff --git a/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch b/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch deleted file mode 100644 index 3a622b5..0000000 --- a/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- docs/Makefile.orig 2012-04-30 17:00:01.000000000 +0200 -+++ docs/Makefile 2012-04-30 17:15:52.000000000 +0200 -@@ -52,11 +52,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 -@@ -68,12 +67,11 @@ - install-doxygen: doxygen - $(Echo) Installing doxygen documentation - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) - $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \ - $(FIND) . -type f -exec \ - $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \; - --doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz -+doxygen: regendoc - - regendoc: - $(Echo) Building doxygen documentation -@@ -99,7 +97,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 \; -@@ -109,7 +106,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/files/llvm-3.3-R600_debug.patch b/sys-devel/llvm/files/llvm-3.3-R600_debug.patch deleted file mode 100644 index b104273..0000000 --- a/sys-devel/llvm/files/llvm-3.3-R600_debug.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fixes compilation of llvm-3.3 on gcc-4.6 and 4.7 when VIDEO_CARDS=radeon - -This issue is caused because although Q is a multiset the original code tries to get -a set iterator which can't be converted in a multiset one. - -The fix is as simple as just using a multiset iterator. - -Patch by Francisco Blas Izquierdo Riera (klondike) -Consider the changes in the Public Domain -https://bugs.gentoo.org/show_bug.cgi?id=474096 - ---- lib/Target/R600/R600MachineScheduler.cpp -+++ lib/Target/R600/R600MachineScheduler.cpp -@@ -290,7 +290,7 @@ - SUnit *R600SchedStrategy::PopInst(std::multiset<SUnit *, CompareSUnit> &Q) { - if (Q.empty()) - return NULL; -- for (std::set<SUnit *, CompareSUnit>::iterator It = Q.begin(), E = Q.end(); -+ for (std::multiset<SUnit *, CompareSUnit>::iterator It = Q.begin(), E = Q.end(); - It != E; ++It) { - SUnit *SU = *It; - InstructionsGroupCandidate.push_back(SU->getInstr()); diff --git a/sys-devel/llvm/files/llvm-3.3-cmake-modulepath.patch b/sys-devel/llvm/files/llvm-3.3-cmake-modulepath.patch deleted file mode 100644 index 754ae46..0000000 --- a/sys-devel/llvm/files/llvm-3.3-cmake-modulepath.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- cmake/modules/LLVMConfig.cmake.in.old 2013-12-30 14:40:54.888983600 +0100 -+++ cmake/modules/LLVMConfig.cmake.in 2013-12-30 14:44:15.448970509 +0100 -@@ -39,16 +39,10 @@ - set(LLVM_LIBRARY_DIRS ${LLVM_INSTALL_PREFIX}/lib) - set(LLVM_DEFINITIONS "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS") - --# We try to include using the current setting of CMAKE_MODULE_PATH, --# which suppossedly was filled by the user with the directory where --# this file was installed: --include( LLVM-Config OPTIONAL RESULT_VARIABLE LLVMCONFIG_INCLUDED ) -- --# If failed, we assume that this is an un-installed build: --if( NOT LLVMCONFIG_INCLUDED ) -- set(CMAKE_MODULE_PATH -+# For some reasons without it it fails on Gentoo, see bug #496480 -+set(CMAKE_MODULE_PATH - ${CMAKE_MODULE_PATH} -- "@LLVM_SOURCE_DIR@/cmake/modules") -- include( LLVM-Config ) --endif() -+ "@LLVM_INSTALL_PREFIX@/share/llvm/cmake") -+ -+include(LLVM-Config) - diff --git a/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch deleted file mode 100644 index e477be5..0000000 --- a/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 378109dbae7e4772d9b096384904c638a6a34028 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl> -Date: Fri, 19 Jul 2013 10:10:52 +0200 -Subject: [PATCH 1/2] gentoo install fixes - ---- - Makefile.config.in | 6 +++--- - Makefile.rules | 7 +++---- - tools/gold/Makefile | 2 +- - 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(+), 11 deletions(-) - -diff --git a/Makefile.config.in b/Makefile.config.in -index fd4f6ef..5634ecc 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)/llvm - 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 f0c542b..db252f7 100644 ---- a/Makefile.rules -+++ b/Makefile.rules -@@ -276,7 +276,7 @@ ifeq ($(ENABLE_OPTIMIZED),1) - # Don't use -fomit-frame-pointer on Darwin or FreeBSD. - ifneq ($(HOST_OS),FreeBSD) - ifneq ($(HOST_OS),Darwin) -- OmitFramePointer := -fomit-frame-pointer -+ OmitFramePointer := - endif - endif - -@@ -639,7 +638,7 @@ endif - ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) - ifneq ($(HOST_OS), Darwin) - ifdef TOOLNAME -- LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' -+ LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)' - ifdef EXAMPLE_TOOL - LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag) - else -@@ -648,7 +647,7 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) - endif - else - ifneq ($(DARWIN_MAJVERS),4) -- LD.Flags += $(RPATH) -Wl,@executable_path/../lib -+ LD.Flags += $(RPATH) -Wl,@executable_path/../lib -Wl,'$(PROJ_libdir)' - endif - ifeq ($(RC_XBS),YES) - TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX) -diff --git a/tools/gold/Makefile b/tools/gold/Makefile -index 496e31c..d36b340 100644 ---- a/tools/gold/Makefile -+++ b/tools/gold/Makefile -@@ -24,7 +24,7 @@ include $(LEVEL)/Makefile.config - # Because off_t is used in the public API, the largefile parts are required for - # ABI compatibility. - CXXFLAGS += -I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 --LDFLAGS += -L$(SharedLibDir)/$(SharedPrefix) -+LDFLAGS += -L$(PROJ_libdir) - - include $(LEVEL)/Makefile.common - -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,5 @@ - #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" - #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" - #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" -+#define LLVM_RPATH "@LLVM_RPATH@" -+#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,10 @@ $(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_RPATH@/$(subst /,\/,$(RPATH))/' \ -+ >> 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 7edf5ec..4541c28 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 "/llvm"; - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - -@@ -277,7 +277,8 @@ int main(int argc, char **argv) { - } else if (Arg == "--cxxflags") { - OS << ActiveIncludeOption << ' ' << LLVM_CXXFLAGS << '\n'; - } else if (Arg == "--ldflags") { -- OS << "-L" << ActiveLibDir << ' ' << LLVM_LDFLAGS -+ OS << "-L" << ActiveLibDir << ' ' -+ << LLVM_RPATH << " -Wl," << ActiveLibDir << ' ' << LLVM_LDFLAGS - << ' ' << LLVM_SYSTEM_LIBS << '\n'; - } else if (Arg == "--libs") { - PrintLibs = true; -diff --git a/utils/FileCheck/Makefile b/utils/FileCheck/Makefile -index 268b7bc..e7674f9 100644 ---- a/utils/FileCheck/Makefile -+++ b/utils/FileCheck/Makefile -@@ -15,7 +15,7 @@ USEDLIBS = LLVMSupport.a - TOOL_NO_EXPORTS = 1 - - # Don't install this utility --NO_INSTALL = 1 -+#NO_INSTALL = 1 - - include $(LEVEL)/Makefile.common - --- -1.8.3.2 - diff --git a/sys-devel/llvm/files/llvm-3.3-insecure-rpath.patch b/sys-devel/llvm/files/llvm-3.3-insecure-rpath.patch deleted file mode 100644 index 659f237..0000000 --- a/sys-devel/llvm/files/llvm-3.3-insecure-rpath.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d23d21bc76693dd2a43b5d76c68972ac01a055ba Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl> -Date: Sat, 20 Jul 2013 15:56:56 +0200 -Subject: [PATCH] Remove insecure RUNPATHs. - -LLVM seems to build fine without them, and they were removed for 3.4 -already. ---- - Makefile.rules | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/Makefile.rules b/Makefile.rules -index db252f7..a29481b 100644 ---- a/Makefile.rules -+++ b/Makefile.rules -@@ -639,11 +639,6 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) - ifneq ($(HOST_OS), Darwin) - ifdef TOOLNAME - LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)' -- ifdef EXAMPLE_TOOL -- LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag) -- else -- LD.Flags += $(RPATH) -Wl,$(ToolDir) $(DynamicFlag) -- endif - endif - else - ifneq ($(DARWIN_MAJVERS),4) --- -1.8.3.2 - diff --git a/sys-devel/llvm/files/llvm-3.3-r2-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.3-r2-gentoo-install.patch deleted file mode 100644 index c5bd8b8..0000000 --- a/sys-devel/llvm/files/llvm-3.3-r2-gentoo-install.patch +++ /dev/null @@ -1,117 +0,0 @@ -From a554809b6bdbe29b1f775c89104c1088300685ef Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sat, 28 Dec 2013 10:30:28 +0100 -Subject: [PATCH] Update for gentoo install layout. - ---- - Makefile.config.in | 6 +++--- - Makefile.rules | 8 ++++---- - tools/llvm-config/BuildVariables.inc.in | 1 + - tools/llvm-config/Makefile | 2 ++ - tools/llvm-config/llvm-config.cpp | 2 +- - utils/FileCheck/Makefile | 2 +- - 6 files changed, 12 insertions(+), 9 deletions(-) - -diff --git a/Makefile.config.in b/Makefile.config.in -index fd4f6ef..b63786c 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 f0c542b..6cc19fd 100644 ---- a/Makefile.rules -+++ b/Makefile.rules -@@ -276,7 +276,7 @@ ifeq ($(ENABLE_OPTIMIZED),1) - # Don't use -fomit-frame-pointer on Darwin or FreeBSD. - ifneq ($(HOST_OS),FreeBSD) - ifneq ($(HOST_OS),Darwin) -- OmitFramePointer := -fomit-frame-pointer -+ OmitFramePointer := - endif - endif - -@@ -601,7 +601,7 @@ endif - ifdef SHARED_LIBRARY - ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) - ifneq ($(HOST_OS),Darwin) -- LD.Flags += $(RPATH) -Wl,'$$ORIGIN' -+ LD.Flags += - endif - endif - endif -@@ -641,9 +641,9 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) - ifdef TOOLNAME - LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' - ifdef EXAMPLE_TOOL -- LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag) -+ LD.Flags += $(DynamicFlag) - else -- LD.Flags += $(RPATH) -Wl,$(ToolDir) $(DynamicFlag) -+ LD.Flags += $(DynamicFlag) - endif - endif - else -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index fe87afb..908acd4 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..0aeba45 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 7edf5ec..c09b702 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; - } - -diff --git a/utils/FileCheck/Makefile b/utils/FileCheck/Makefile -index 268b7bc..e7674f9 100644 ---- a/utils/FileCheck/Makefile -+++ b/utils/FileCheck/Makefile -@@ -15,7 +15,7 @@ USEDLIBS = LLVMSupport.a - TOOL_NO_EXPORTS = 1 - - # Don't install this utility --NO_INSTALL = 1 -+#NO_INSTALL = 1 - - include $(LEVEL)/Makefile.common - --- -1.8.5.2 - diff --git a/sys-devel/llvm/files/llvm-3.4-cmake-configparser.patch b/sys-devel/llvm/files/llvm-3.4-cmake-configparser.patch deleted file mode 100644 index cda8bdc..0000000 --- a/sys-devel/llvm/files/llvm-3.4-cmake-configparser.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 773560acfad511769017e971991c0305dbc0323d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 11 Jun 2014 09:40:26 +0200 -Subject: [PATCH] Avoid using external configparser in favor of built-in - ConfigParser. - -We only support Python 2 anyway, and configparser-3.2 is known to break -the build. Since some packages actually force version 3.2, and we do not -to pull in extra dependencies, forcing built-in seems to be the best -option. - -Fixes: https://bugs.gentoo.org/show_bug.cgi?id=500856 ---- - utils/llvm-build/llvmbuild/componentinfo.py | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/utils/llvm-build/llvmbuild/componentinfo.py b/utils/llvm-build/llvmbuild/componentinfo.py -index eda3a48..c963ef1 100644 ---- a/utils/llvm-build/llvmbuild/componentinfo.py -+++ b/utils/llvm-build/llvmbuild/componentinfo.py -@@ -3,10 +3,7 @@ Descriptor objects for entities that are part of the LLVM project. - """ - - from __future__ import absolute_import --try: -- import configparser --except: -- import ConfigParser as configparser -+import ConfigParser as configparser - import sys - - from llvmbuild.util import * --- -2.0.0 - diff --git a/sys-devel/llvm/files/llvm-3.4-fix_varargs.patch b/sys-devel/llvm/files/llvm-3.4-fix_varargs.patch deleted file mode 100644 index 377c4da..0000000 --- a/sys-devel/llvm/files/llvm-3.4-fix_varargs.patch +++ /dev/null @@ -1,148 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=497298 -http://llvm.org/bugs/show_bug.cgi?id=18346 - -SVN revisions: -http://llvm.org/viewvc/llvm-project?view=revision&revision=197503 -http://llvm.org/viewvc/llvm-project?view=revision&revision=197505 -http://llvm.org/viewvc/llvm-project?view=revision&revision=197520 - -diff -Naur llvm-3.4.orig/lib/Target/X86/X86ISelLowering.cpp llvm-3.4/lib/Target/X86/X86ISelLowering.cpp ---- llvm-3.4.orig/lib/Target/X86/X86ISelLowering.cpp 2014-01-08 11:22:23.373060109 +0100 -+++ llvm-3.4/lib/Target/X86/X86ISelLowering.cpp 2014-01-08 11:23:58.517125907 +0100 -@@ -15226,9 +15226,15 @@ - MBB->addSuccessor(EndMBB); - } - -+ // Make sure the last operand is EFLAGS, which gets clobbered by the branch -+ // that was just emitted, but clearly shouldn't be "saved". -+ assert((MI->getNumOperands() <= 3 || -+ !MI->getOperand(MI->getNumOperands() - 1).isReg() || -+ MI->getOperand(MI->getNumOperands() - 1).getReg() == X86::EFLAGS) -+ && "Expected last argument to be EFLAGS"); - unsigned MOVOpc = Subtarget->hasFp256() ? X86::VMOVAPSmr : X86::MOVAPSmr; - // In the XMM save block, save all the XMM argument registers. -- for (int i = 3, e = MI->getNumOperands(); i != e; ++i) { -+ for (int i = 3, e = MI->getNumOperands() - 1; i != e; ++i) { - int64_t Offset = (i - 3) * 16 + VarArgsFPOffset; - MachineMemOperand *MMO = - F->getMachineMemOperand( -diff -Naur llvm-3.4.orig/lib/Target/X86/X86InstrCompiler.td llvm-3.4/lib/Target/X86/X86InstrCompiler.td ---- llvm-3.4.orig/lib/Target/X86/X86InstrCompiler.td 2014-01-08 11:22:23.374060109 +0100 -+++ llvm-3.4/lib/Target/X86/X86InstrCompiler.td 2014-01-08 11:23:39.654112857 +0100 -@@ -72,7 +72,7 @@ - - - // x86-64 va_start lowering magic. --let usesCustomInserter = 1 in { -+let usesCustomInserter = 1, Defs = [EFLAGS] in { - def VASTART_SAVE_XMM_REGS : I<0, Pseudo, - (outs), - (ins GR8:$al, -@@ -81,7 +81,8 @@ - "#VASTART_SAVE_XMM_REGS $al, $regsavefi, $offset", - [(X86vastart_save_xmm_regs GR8:$al, - imm:$regsavefi, -- imm:$offset)]>; -+ imm:$offset), -+ (implicit EFLAGS)]>; - - // The VAARG_64 pseudo-instruction takes the address of the va_list, - // and places the address of the next argument into a register. -diff -Naur llvm-3.4.orig/test/CodeGen/X86/vaargs.ll llvm-3.4/test/CodeGen/X86/vaargs.ll ---- llvm-3.4.orig/test/CodeGen/X86/vaargs.ll 1970-01-01 01:00:00.000000000 +0100 -+++ llvm-3.4/test/CodeGen/X86/vaargs.ll 2014-01-08 11:23:53.451122402 +0100 -@@ -0,0 +1,67 @@ -+; RUN: llc -mcpu=corei7-avx %s -o - | FileCheck %s --check-prefix=CHECK --check-prefix=NO-FLAGS -+target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" -+target triple = "x86_64-apple-macosx10.9.0" -+ -+%struct.__va_list_tag = type { i32, i32, i8*, i8* } -+ -+; Check that vastart gets the right thing. -+define i32 @sum(i32 %count, ...) nounwind optsize ssp uwtable { -+; CHECK: testb %al, %al -+; CHECK-NEXT: je -+; CHECK-NEXT: ## BB#{{[0-9]+}}: -+; CHECK-NEXT: vmovaps %xmm0, 48(%rsp) -+; CHECK-NEXT: vmovaps %xmm1, 64(%rsp) -+; CHECK-NEXT: vmovaps %xmm2, 80(%rsp) -+; CHECK-NEXT: vmovaps %xmm3, 96(%rsp) -+; CHECK-NEXT: vmovaps %xmm4, 112(%rsp) -+; CHECK-NEXT: vmovaps %xmm5, 128(%rsp) -+; CHECK-NEXT: vmovaps %xmm6, 144(%rsp) -+; CHECK-NEXT: vmovaps %xmm7, 160(%rsp) -+ -+; Check that [EFLAGS] hasn't been pulled in. -+; NO-FLAGS-NOT: %flags -+ -+ %ap = alloca [1 x %struct.__va_list_tag], align 16 -+ %1 = bitcast [1 x %struct.__va_list_tag]* %ap to i8* -+ call void @llvm.va_start(i8* %1) -+ %2 = icmp sgt i32 %count, 0 -+ br i1 %2, label %.lr.ph, label %._crit_edge -+ -+.lr.ph: ; preds = %0 -+ %3 = getelementptr inbounds [1 x %struct.__va_list_tag]* %ap, i64 0, i64 0, i32 0 -+ %4 = getelementptr inbounds [1 x %struct.__va_list_tag]* %ap, i64 0, i64 0, i32 2 -+ %.pre = load i32* %3, align 16 -+ br label %5 -+ -+; <label>:5 ; preds = %.lr.ph, %13 -+ %6 = phi i32 [ %.pre, %.lr.ph ], [ %14, %13 ] -+ %.01 = phi i32 [ %count, %.lr.ph ], [ %15, %13 ] -+ %7 = icmp ult i32 %6, 41 -+ br i1 %7, label %8, label %10 -+ -+; <label>:8 ; preds = %5 -+ %9 = add i32 %6, 8 -+ store i32 %9, i32* %3, align 16 -+ br label %13 -+ -+; <label>:10 ; preds = %5 -+ %11 = load i8** %4, align 8 -+ %12 = getelementptr i8* %11, i64 8 -+ store i8* %12, i8** %4, align 8 -+ br label %13 -+ -+; <label>:13 ; preds = %10, %8 -+ %14 = phi i32 [ %6, %10 ], [ %9, %8 ] -+ %15 = add nsw i32 %.01, 1 -+ %16 = icmp sgt i32 %15, 0 -+ br i1 %16, label %5, label %._crit_edge -+ -+._crit_edge: ; preds = %13, %0 -+ %.0.lcssa = phi i32 [ %count, %0 ], [ %15, %13 ] -+ call void @llvm.va_end(i8* %1) -+ ret i32 %.0.lcssa -+} -+ -+declare void @llvm.va_start(i8*) nounwind -+ -+declare void @llvm.va_end(i8*) nounwind -diff -Naur llvm-3.4.orig/test/CodeGen/X86/vastart-defs-eflags.ll llvm-3.4/test/CodeGen/X86/vastart-defs-eflags.ll ---- llvm-3.4.orig/test/CodeGen/X86/vastart-defs-eflags.ll 1970-01-01 01:00:00.000000000 +0100 -+++ llvm-3.4/test/CodeGen/X86/vastart-defs-eflags.ll 2014-01-08 11:23:39.654112857 +0100 -@@ -0,0 +1,23 @@ -+; RUN: llc %s -o - | FileCheck %s -+ -+target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" -+target triple = "x86_64-apple-macosx10.10.0" -+ -+; Check that vastart handling doesn't get between testb and je for the branch. -+define i32 @check_flag(i32 %flags, ...) nounwind { -+entry: -+; CHECK: {{^}} testb $2, %bh -+; CHECK-NOT: test -+; CHECK: {{^}} je -+ %and = and i32 %flags, 512 -+ %tobool = icmp eq i32 %and, 0 -+ br i1 %tobool, label %if.end, label %if.then -+ -+if.then: ; preds = %entry -+ br label %if.end -+ -+if.end: ; preds = %entry, %if.then -+ %hasflag = phi i32 [ 1, %if.then ], [ 0, %entry ] -+ ret i32 %hasflag -+} -+ diff --git a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch deleted file mode 100644 index a2ba7de..0000000 --- a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch +++ /dev/null @@ -1,96 +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; - } - -diff --git a/utils/FileCheck/Makefile b/utils/FileCheck/Makefile -index 268b7bc..e7674f9 100644 ---- a/utils/FileCheck/Makefile -+++ b/utils/FileCheck/Makefile -@@ -15,7 +15,7 @@ USEDLIBS = LLVMSupport.a - TOOL_NO_EXPORTS = 1 - - # Don't install this utility --NO_INSTALL = 1 -+#NO_INSTALL = 1 - - include $(LEVEL)/Makefile.common - --- -1.8.4.2 - diff --git a/sys-devel/llvm/files/llvm-3.5-gcc-4.9.patch b/sys-devel/llvm/files/llvm-3.5-gcc-4.9.patch deleted file mode 100644 index 7da657f..0000000 --- a/sys-devel/llvm/files/llvm-3.5-gcc-4.9.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit 080fb498017d17af2e4d7563608c7d8a848f20da -Author: Sanjoy Das <sanjoy at azulsystems.com> -Date: Thu Jun 19 15:38:02 2014 -0700 - - Fix the --enable-shared build. - - Currently a build configured with ./configure --enable-shared breaks - with an undefined "llvm::cl::parser<llvm::PassInfo - const*>::getOption(unsigned int) const" symbol when linking opt. This - body for this symbol gets emitted into Pass.o (along with the destructor - for PassNameParser), but gets linked into libLLVM-3.5svn.so with local - visibility, causing the link error. - - This fix uses the existing EXTERN_TEMPLATE machinery to force a globally - visible definition for the functions in parser<const PassInfo *> into - Pass.o. - -diff --git a/include/llvm/IR/LegacyPassNameParser.h b/include/llvm/IR/LegacyPassNameParser.h -index e2e4912..a07e3fd 100644 ---- a/include/llvm/IR/LegacyPassNameParser.h -+++ b/include/llvm/IR/LegacyPassNameParser.h -@@ -95,6 +95,8 @@ private: - } - }; - -+EXTERN_TEMPLATE_INSTANTIATION(class cl::parser<const PassInfo *>); -+ - ///===----------------------------------------------------------------------===// - /// FilteredPassNameParser class - Make use of the pass registration - /// mechanism to automatically add a command line argument to opt for -diff --git a/lib/IR/Pass.cpp b/lib/IR/Pass.cpp -index 91d86ae..00ce223 100644 ---- a/lib/IR/Pass.cpp -+++ b/lib/IR/Pass.cpp -@@ -234,6 +234,8 @@ PassNameParser::~PassNameParser() { - // attempting to remove the registration listener is an error. - } - -+TEMPLATE_INSTANTIATION(class cl::parser<const PassInfo *>); -+ - //===----------------------------------------------------------------------===// - // AnalysisUsage Class Implementation - // diff --git a/sys-devel/llvm/files/llvm-3.5-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.5-gentoo-install.patch deleted file mode 100644 index 7a8c9f7..0000000 --- a/sys-devel/llvm/files/llvm-3.5-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/files/llvm-3.5.0-fix_LLVMExports_cmake.patch b/sys-devel/llvm/files/llvm-3.5.0-fix_LLVMExports_cmake.patch deleted file mode 100644 index 9fbd7b7..0000000 --- a/sys-devel/llvm/files/llvm-3.5.0-fix_LLVMExports_cmake.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: cmake/modules/Makefile -=================================================================== ---- cmake/modules/Makefile (revision 217451) -+++ cmake/modules/Makefile (working copy) -@@ -33,6 +33,16 @@ - LLVM_ENABLE_RTTI := 0 - endif - -+LLVM_LIBS_TO_EXPORT := $(subst -l,,$(shell $(LLVM_CONFIG) --libs $(LINK_COMPONENTS) || echo Error)) -+ -+ifeq ($(LLVM_LIBS_TO_EXPORT),Error) -+$(error llvm-config --libs failed) -+endif -+ -+ifndef LLVM_LIBS_TO_EXPORT -+$(error LLVM_LIBS_TO_EXPORT cannot be empty) -+endif -+ - OBJMODS := LLVMConfig.cmake LLVMConfigVersion.cmake LLVMExports.cmake - - $(PROJ_OBJ_DIR)/LLVMConfig.cmake: LLVMConfig.cmake.in $(LLVMBuildCMakeFrag) -@@ -45,7 +55,7 @@ - -e 's/@LLVM_VERSION_PATCH@/'"$(LLVM_VERSION_PATCH)"'/' \ - -e 's/@PACKAGE_VERSION@/'"$(LLVMVersion)"'/' \ - -e 's/@LLVM_COMMON_DEPENDS@//' \ -- -e 's/@LLVM_AVAILABLE_LIBS@/'"$(subst -l,,$(LLVMConfigLibs))"'/' \ -+ -e 's/@LLVM_AVAILABLE_LIBS@/'"$(LLVM_LIBS_TO_EXPORT)"'/' \ - -e 's/@LLVM_ALL_TARGETS@/'"$(ALL_TARGETS)"'/' \ - -e 's/@LLVM_TARGETS_TO_BUILD@/'"$(TARGETS_TO_BUILD)"'/' \ - -e 's/@LLVM_TARGETS_WITH_JIT@/'"$(TARGETS_WITH_JIT)"'/' \ -@@ -83,7 +93,7 @@ - $(Echo) 'Generating LLVM CMake target exports file' - $(Verb) ( \ - echo '# LLVM CMake target exports. Do not include directly.' && \ -- for lib in $(subst -l,,$(LLVMConfigLibs)); do \ -+ for lib in $(LLVM_LIBS_TO_EXPORT); do \ - echo 'add_library('"$$lib"' STATIC IMPORTED)' && \ - echo 'set_property(TARGET '"$$lib"' PROPERTY IMPORTED_LOCATION "'"$(PROJ_libdir)/lib$$lib.a"'")' ; \ - done && \ diff --git a/sys-devel/llvm/files/llvm-3.5.2-gcc-5.1.patch b/sys-devel/llvm/files/llvm-3.5.2-gcc-5.1.patch deleted file mode 100644 index 7cb2817..0000000 --- a/sys-devel/llvm/files/llvm-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/llvm-3.6-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.6-gentoo-install.patch deleted file mode 100644 index c4d0db2..0000000 --- a/sys-devel/llvm/files/llvm-3.6-gentoo-install.patch +++ /dev/null @@ -1,82 +0,0 @@ -From bb016afeba4d9e886e776565a508634a261111a2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 31 Dec 2014 11:26:12 +0100 -Subject: [PATCH] gentoo build fixes - ---- - Makefile.config.in | 6 +++--- - Makefile.rules | 2 +- - tools/llvm-config/BuildVariables.inc.in | 1 + - tools/llvm-config/Makefile | 2 ++ - tools/llvm-config/llvm-config.cpp | 2 +- - 5 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/Makefile.config.in b/Makefile.config.in -index d34a2d5..a26cd08 100644 ---- a/Makefile.config.in -+++ b/Makefile.config.in -@@ -99,10 +99,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 c8c971f..d1258b1 100644 ---- a/Makefile.rules -+++ b/Makefile.rules -@@ -283,7 +283,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 3f51f49..513ea89 100644 ---- a/tools/llvm-config/BuildVariables.inc.in -+++ b/tools/llvm-config/BuildVariables.inc.in -@@ -26,3 +26,4 @@ - #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" - #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 1ff8b6f..5d73c6e 100644 ---- a/tools/llvm-config/Makefile -+++ b/tools/llvm-config/Makefile -@@ -65,6 +65,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 224035a..57180ac 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -265,7 +265,7 @@ int main(int argc, char **argv) { - ActivePrefix = CurrentExecPrefix; - ActiveIncludeDir = ActivePrefix + "/include"; - ActiveBinDir = ActivePrefix + "/bin"; -- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; -+ ActiveLibDir = ActivePrefix + "/" LLVM_LIBDIR; - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - --- -2.2.1 - diff --git a/sys-devel/llvm/files/llvm-3.6.0-ocaml-ctypes-0.4.0.patch b/sys-devel/llvm/files/llvm-3.6.0-ocaml-ctypes-0.4.0.patch deleted file mode 100644 index 154c9cc..0000000 --- a/sys-devel/llvm/files/llvm-3.6.0-ocaml-ctypes-0.4.0.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur llvm-3.6.0.src.orig/bindings/ocaml/executionengine/llvm_executionengine.ml llvm-3.6.0.src/bindings/ocaml/executionengine/llvm_executionengine.ml ---- llvm-3.6.0.src.orig/bindings/ocaml/executionengine/llvm_executionengine.ml 2015-03-17 11:49:27.274824345 +0100 -+++ llvm-3.6.0.src/bindings/ocaml/executionengine/llvm_executionengine.ml 2015-03-17 11:49:40.333829421 +0100 -@@ -43,11 +43,11 @@ - = "llvm_ee_run_static_dtors" - external data_layout : llexecutionengine -> Llvm_target.DataLayout.t - = "llvm_ee_get_data_layout" --external add_global_mapping_ : Llvm.llvalue -> int64 -> llexecutionengine -> unit -+external add_global_mapping_ : Llvm.llvalue -> nativeint -> llexecutionengine -> unit - = "llvm_ee_add_global_mapping" --external get_global_value_address_ : string -> llexecutionengine -> int64 -+external get_global_value_address_ : string -> llexecutionengine -> nativeint - = "llvm_ee_get_global_value_address" --external get_function_address_ : string -> llexecutionengine -> int64 -+external get_function_address_ : string -> llexecutionengine -> nativeint - = "llvm_ee_get_function_address" - - let add_global_mapping llval ptr ee = -@@ -55,14 +55,14 @@ - - let get_global_value_address name typ ee = - let vptr = get_global_value_address_ name ee in -- if Int64.to_int vptr <> 0 then -+ if Nativeint.to_int vptr <> 0 then - let open Ctypes in !@ (coerce (ptr void) (ptr typ) (ptr_of_raw_address vptr)) - else - raise (Error ("Value " ^ name ^ " not found")) - - let get_function_address name typ ee = - let fptr = get_function_address_ name ee in -- if Int64.to_int fptr <> 0 then -+ if Nativeint.to_int fptr <> 0 then - let open Ctypes in coerce (ptr void) typ (ptr_of_raw_address fptr) - else - raise (Error ("Function " ^ name ^ " not found")) diff --git a/sys-devel/llvm/files/llvm-3.7-lldb_python.patch b/sys-devel/llvm/files/llvm-3.7-lldb_python.patch deleted file mode 100644 index 1a95827..0000000 --- a/sys-devel/llvm/files/llvm-3.7-lldb_python.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur llvm-3.7.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py llvm-3.7.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py ---- llvm-3.7.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py 2015-06-04 05:12:37.000000000 +0200 -+++ llvm-3.7.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py 2015-10-11 19:19:54.074935710 +0200 -@@ -371,14 +371,14 @@ - strLibFileExtn = ".dylib"; - else: - strLibFileExtn = ".so"; -- strSrc = os.path.join("lib", "liblldb" + strLibFileExtn); -+ strSrc = os.path.join("GENTOO_LIBDIR", "liblldb" + strLibFileExtn); - -- if eOSType != utilsOsType.EnumOsType.Windows: -+# if eOSType != utilsOsType.EnumOsType.Windows: - # Create a symlink to the "lib" directory, to ensure liblldb's RPATH is - # effective. -- bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, "lib", os.path.join("../lib") ); -- if not bOk: -- return (bOk, strErrMsg) -+# bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, "lib", os.path.join("../lib") ); -+# if not bOk: -+# return (bOk, strErrMsg) - - bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget ); - diff --git a/sys-devel/llvm/files/llvm-3.7-llvm-config.patch b/sys-devel/llvm/files/llvm-3.7-llvm-config.patch deleted file mode 100644 index 932c92b..0000000 --- a/sys-devel/llvm/files/llvm-3.7-llvm-config.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 8a51e9673859eb3fb819f0d1dad5e2a60d1a3c0a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 2 Dec 2015 16:04:56 +0100 -Subject: [PATCH] llvm-config: Clean up exported values, update for shared - linking - -Gentoo-specific fixup for llvm-config, including: -- wiping build-specific CFLAGS, CXXFLAGS, -- updating library suffixes for shared libs, -- wiping --system-libs for shared linking, -- banning --obj-root and --src-root due to no sources installed. - -Thanks to Steven Newbury for the initial patch. - -Bug: https://bugs.gentoo.org/565358 -Bug: https://bugs.gentoo.org/501684 ---- - tools/llvm-config/CMakeLists.txt | 11 ++++++++--- - tools/llvm-config/llvm-config.cpp | 22 ++++++++++++++++------ - utils/llvm-build/llvmbuild/main.py | 4 +++- - 4 files changed, 27 insertions(+), 10 deletions(-) - -diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index edbd8c9..9a801bd 100644 ---- a/tools/llvm-config/CMakeLists.txt -+++ b/tools/llvm-config/CMakeLists.txt -@@ -22,12 +22,17 @@ get_property(COMPILE_FLAGS TARGET llvm-config PROPERTY COMPILE_FLAGS) - set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR}) - set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) - set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") -+# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler -+# specific flags will be set when we don't know what compiler will be used -+# with external project utilising llvm-config. C++ Standard is required. -+# TODO: figure out if we can remove -std=c++11 and move it to revdeps. -+set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -+set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") - # Use the C++ link flags, since they should be a superset of C link flags. - set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") - set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) --set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) -+# We don't do static libs, so we don't need to supply any system-libs -+set(LLVM_SYSTEM_LIBS "") - string(REPLACE ";" " " LLVM_TARGETS_BUILT "${LLVM_TARGETS_TO_BUILD}") - configure_file(${BUILDVARIABLES_SRCPATH} ${BUILDVARIABLES_OBJPATH} @ONLY) - -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 879b9ab..d2c43fa 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -323,10 +323,19 @@ int main(int argc, char **argv) { - #else - OS << "ON\n"; - #endif -- } else if (Arg == "--obj-root") { -- OS << ActivePrefix << '\n'; -- } else if (Arg == "--src-root") { -- OS << LLVM_SRC_ROOT << '\n'; -+ } else if (Arg == "--obj-root" || Arg == "--src-root") { -+ if (IsInDevelopmentTree) { -+ if (Arg == "--obj-root") { -+ OS << ActivePrefix << '\n'; -+ } else { -+ OS << LLVM_SRC_ROOT << '\n'; -+ } -+ } else { -+ // sources are not installed -+ llvm::errs() << "llvm-config: sources not installed, " -+ << Arg << " not available\n"; -+ exit(1); -+ } - } else { - usage(); - } -@@ -360,8 +369,9 @@ int main(int argc, char **argv) { - OS << ActiveLibDir << '/' << Lib; - } else if (PrintLibs) { - // If this is a typical library name, include it using -l. -- if (Lib.startswith("lib") && Lib.endswith(".a")) { -- OS << "-l" << Lib.slice(3, Lib.size()-2); -+ if (Lib.startswith("lib") && Lib.endswith(LTDL_SHLIB_EXT)) { -+ // sizeof counts trailing NUL -+ OS << "-l" << Lib.slice(3, Lib.size()-sizeof(LTDL_SHLIB_EXT)+1); - continue; - } - -diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py -index 353741f..4ba5e91 100644 ---- a/utils/llvm-build/llvmbuild/main.py -+++ b/utils/llvm-build/llvmbuild/main.py -@@ -393,6 +393,8 @@ subdirectories = %s - // - //===----------------------------------------------------------------------===// - -+#include "llvm/Config/config.h" -+ - """) - f.write('struct AvailableComponent {\n') - f.write(' /// The name of the component.\n') -@@ -413,7 +415,7 @@ subdirectories = %s - if library_name is None: - library_name_as_cstr = '0' - else: -- library_name_as_cstr = '"lib%s.a"' % library_name -+ library_name_as_cstr = '"lib%s" LTDL_SHLIB_EXT' % library_name - f.write(' { "%s", %s, %d, { %s } },\n' % ( - name, library_name_as_cstr, is_installed, - ', '.join('"%s"' % dep - --- -2.6.3 - diff --git a/sys-devel/llvm/files/llvm-3.7-msan-fix.patch b/sys-devel/llvm/files/llvm-3.7-msan-fix.patch deleted file mode 100644 index e44baa8..0000000 --- a/sys-devel/llvm/files/llvm-3.7-msan-fix.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 8b0f2fff6e080c053e4fd94d44a694768b8c156e Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" <hjl.tools@gmail.com> -Date: Wed, 5 Aug 2015 05:35:26 -0700 -Subject: [PATCH 78/84] Apply split-layout-llvm.patch - -https://llvm.org/bugs/show_bug.cgi?id=24155 ---- - lib/Transforms/Instrumentation/MemorySanitizer.cpp | 31 ++++++++++++++++------ - 1 file changed, 23 insertions(+), 8 deletions(-) - -diff --git a/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/lib/Transforms/Instrumentation/MemorySanitizer.cpp -index 286a563..2ab8bfc 100644 ---- a/lib/Transforms/Instrumentation/MemorySanitizer.cpp -+++ b/lib/Transforms/Instrumentation/MemorySanitizer.cpp -@@ -194,6 +194,12 @@ static cl::opt<bool> ClCheckConstantShadow("msan-check-constant-shadow", - static const char *const kMsanModuleCtorName = "msan.module_ctor"; - static const char *const kMsanInitName = "__msan_init"; - -+static cl::opt<bool> ClSplitLayout( -+ "msan-split-layout", cl::desc( -+ "use experimental memory layout compatible with " -+ "non-pie and non-aslr execution"), -+ cl::Hidden, cl::init(true)); -+ - namespace { - - // Memory map parameters used in application-to-shadow address calculation. -@@ -228,6 +234,13 @@ static const MemoryMapParams Linux_X86_64_MemoryMapParams = { - 0x200000000000, // OriginBase - }; - -+static const MemoryMapParams Linux_X86_64_Split_MemoryMapParams = { -+ 0, // AndMask (not used) -+ 0x500000000000, // XorMask -+ 0, // ShadowBase (not used) -+ 0x100000000000, // OriginBase -+}; -+ - // mips64 Linux - static const MemoryMapParams Linux_MIPS64_MemoryMapParams = { - 0x004000000000, // AndMask -@@ -483,7 +496,8 @@ bool MemorySanitizer::doInitialization(Module &M) { - case Triple::Linux: - switch (TargetTriple.getArch()) { - case Triple::x86_64: -- MapParams = Linux_X86_MemoryMapParams.bits64; -+ MapParams = ClSplitLayout ? &Linux_X86_64_Split_MemoryMapParams -+ : Linux_X86_MemoryMapParams.bits64; - break; - case Triple::x86: - MapParams = Linux_X86_MemoryMapParams.bits32; -@@ -893,16 +907,17 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> { - /// - /// Offset = (Addr & ~AndMask) ^ XorMask - Value *getShadowPtrOffset(Value *Addr, IRBuilder<> &IRB) { -+ Value *OffsetLong = IRB.CreatePointerCast(Addr, MS.IntptrTy); -+ - uint64_t AndMask = MS.MapParams->AndMask; -- assert(AndMask != 0 && "AndMask shall be specified"); -- Value *OffsetLong = -- IRB.CreateAnd(IRB.CreatePointerCast(Addr, MS.IntptrTy), -- ConstantInt::get(MS.IntptrTy, ~AndMask)); -+ if (AndMask) -+ OffsetLong = -+ IRB.CreateAnd(OffsetLong, ConstantInt::get(MS.IntptrTy, ~AndMask)); - - uint64_t XorMask = MS.MapParams->XorMask; -- if (XorMask != 0) -- OffsetLong = IRB.CreateXor(OffsetLong, -- ConstantInt::get(MS.IntptrTy, XorMask)); -+ if (XorMask) -+ OffsetLong = -+ IRB.CreateXor(OffsetLong, ConstantInt::get(MS.IntptrTy, XorMask)); - return OffsetLong; - } - --- -2.6.4 - diff --git a/sys-devel/llvm/files/llvm-3.7-nodoctargz.patch b/sys-devel/llvm/files/llvm-3.7-nodoctargz.patch deleted file mode 100644 index 8690523..0000000 --- a/sys-devel/llvm/files/llvm-3.7-nodoctargz.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- docs/Makefile.orig 2012-04-30 17:00:01.000000000 +0200 -+++ docs/Makefile 2012-04-30 17:15:52.000000000 +0200 -@@ -52,11 +52,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 -@@ -68,12 +67,11 @@ - - 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-)"; \ - $(MKDIR) $$DESTSUB && \ - $(FIND) $$DIR -maxdepth 1 -type f -exec $(DataInstall) {} $$DESTSUB \; ; \ - if [ $$? != 0 ]; then exit 1; fi \ - done - --doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz -+doxygen: regendoc - - regendoc: - $(Echo) Building doxygen documentation -@@ -99,7 +97,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 \; -@@ -109,7 +106,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/files/llvm-3.7.1-llvm-config-0.patch b/sys-devel/llvm/files/llvm-3.7.1-llvm-config-0.patch deleted file mode 100644 index 87f9ff8..0000000 --- a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-0.patch +++ /dev/null @@ -1,83 +0,0 @@ -From a59464503a7e059ddfd3fb4308753b692d03d996 Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Wed, 9 Sep 2015 16:39:30 +0000 -Subject: [PATCH 1/4] llvm-config: Add --build-system option - -Summary: -This can be used for distinguishing between cmake and autoconf builds. -Users may need this in order to handle inconsistencies between the -outputs of the two build systems. - -Reviewers: echristo, chandlerc, beanz - -Subscribers: llvm-commits - -Differential Revision: http://reviews.llvm.org/D11838 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@247159 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - tools/llvm-config/BuildVariables.inc.in | 1 + - tools/llvm-config/CMakeLists.txt | 2 ++ - tools/llvm-config/Makefile | 2 ++ - tools/llvm-config/llvm-config.cpp | 3 +++ - 4 files changed, 8 insertions(+) - -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index 3f51f49..0f28fad 100644 ---- a/tools/llvm-config/BuildVariables.inc.in -+++ b/tools/llvm-config/BuildVariables.inc.in -@@ -26,3 +26,4 @@ - #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" - #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" - #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" -+#define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" -diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index edbd8c9..dd53460 100644 ---- a/tools/llvm-config/CMakeLists.txt -+++ b/tools/llvm-config/CMakeLists.txt -@@ -24,6 +24,8 @@ set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) - set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") - set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") - set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") -+set(LLVM_BUILD_SYSTEM cmake) -+ - # Use the C++ link flags, since they should be a superset of C link flags. - set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") - set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) -diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile -index 1ff8b6f..c2b5e8f 100644 ---- a/tools/llvm-config/Makefile -+++ b/tools/llvm-config/Makefile -@@ -65,6 +65,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_BUILD_SYSTEM@/autoconf/' \ -+ >> 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 879b9ab..4ce8f10 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -157,6 +157,7 @@ Options:\n\ - --host-target Target triple used to configure LLVM.\n\ - --build-mode Print build mode of LLVM tree (e.g. Debug or Release).\n\ - --assertion-mode Print assertion mode of LLVM tree (ON or OFF).\n\ -+ --build-system Print the build system used to build LLVM (autoconf or cmake).\n\ - Typical components:\n\ - all All LLVM libraries (default).\n\ - engine Either a native JIT or a bitcode interpreter.\n"; -@@ -323,6 +324,8 @@ int main(int argc, char **argv) { - #else - OS << "ON\n"; - #endif -+ } else if (Arg == "--build-system") { -+ OS << LLVM_BUILD_SYSTEM << '\n'; - } else if (Arg == "--obj-root") { - OS << ActivePrefix << '\n'; - } else if (Arg == "--src-root") { --- -2.7.4 - diff --git a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-1.patch b/sys-devel/llvm/files/llvm-3.7.1-llvm-config-1.patch deleted file mode 100644 index 214a3bb..0000000 --- a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-1.patch +++ /dev/null @@ -1,453 +0,0 @@ -From 55433193c56e6b2e0792c3ca1b0ef3881ab01138 Mon Sep 17 00:00:00 2001 -From: Richard Diamond <wichard@vitalitystudios.com> -Date: Mon, 9 Nov 2015 23:15:38 +0000 -Subject: [PATCH 2/4] Fix `llvm-config` to adapt to the install environment. - -Summary: -This patch does a couple of things: - - - Adds a new argument `--shared-mode` which accepts a list of components and prints whether or not the provided components need to be linked statically or shared. - - Fixes `--libnames` when CMake BUILD_SHARED_LIBS is used. - - Fixes `--libnames`, `--libs`, and `--libfiles` for dylib when static components aren't installed. - - Fixes `--libnames`, `--libs`, `--libfiles`, and `--components` to use LLVM_DYLIB_COMPONENTS as the component manifest for dylib linking. - - Uses the host platform's usual convention for filename extensions and such, instead of always defaulting to Unix-izms. - -Because I don't own a Mac, I am not able to test the Mac platform dependent stuff locally. If someone would be willing to run a build for me on their machine (unless there's a better option), I'd appreciate it. - -Reviewers: jfb, brad.king, whitequark, beanz - -Subscribers: beanz, jauhien, llvm-commits - -Differential Revision: http://reviews.llvm.org/D13198 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@252532 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - bindings/ocaml/Makefile.ocaml | 2 + - tools/llvm-config/BuildVariables.inc.in | 3 + - tools/llvm-config/CMakeLists.txt | 5 + - tools/llvm-config/llvm-config.cpp | 265 +++++++++++++++++++++++++++++--- - 4 files changed, 253 insertions(+), 22 deletions(-) - -diff --git a/bindings/ocaml/Makefile.ocaml b/bindings/ocaml/Makefile.ocaml -index 1f65a7b..22b96a2 100644 ---- a/bindings/ocaml/Makefile.ocaml -+++ b/bindings/ocaml/Makefile.ocaml -@@ -277,6 +277,8 @@ uninstall-local:: uninstall-deplibs - - build-deplibs: $(OutputLibs) - -+$(OcamlDir)/%.so: $(LibDir)/%.so -+ $(Verb) ln -sf $< $@ - $(OcamlDir)/%.a: $(LibDir)/%.a - $(Verb) ln -sf $< $@ - -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index 0f28fad..e384838 100644 ---- a/tools/llvm-config/BuildVariables.inc.in -+++ b/tools/llvm-config/BuildVariables.inc.in -@@ -27,3 +27,6 @@ - #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" - #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" - #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" -+#define LLVM_ENABLE_DYLIB "@LLVM_BUILD_LLVM_DYLIB@" -+#define LLVM_ENABLE_SHARED "@LLVM_ENABLE_SHARED@" -+#define LLVM_DYLIB_COMPONENTS "@LLVM_DYLIB_COMPONENTS@" -diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index dd53460..173f6dc 100644 ---- a/tools/llvm-config/CMakeLists.txt -+++ b/tools/llvm-config/CMakeLists.txt -@@ -30,6 +30,11 @@ set(LLVM_BUILD_SYSTEM cmake) - set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") - set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) - set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) -+if(BUILD_SHARED_LIBS) -+ set(LLVM_ENABLE_SHARED ON) -+else() -+ set(LLVM_ENABLE_SHARED OFF) -+endif() - string(REPLACE ";" " " LLVM_TARGETS_BUILT "${LLVM_TARGETS_TO_BUILD}") - configure_file(${BUILDVARIABLES_SRCPATH} ${BUILDVARIABLES_OBJPATH} @ONLY) - -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 4ce8f10..51efbd8 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -30,6 +30,7 @@ - #include <cstdlib> - #include <set> - #include <vector> -+#include <unordered_set> - - using namespace llvm; - -@@ -51,12 +52,16 @@ using namespace llvm; - /// \param Name - The component to traverse. - /// \param ComponentMap - A prebuilt map of component names to descriptors. - /// \param VisitedComponents [in] [out] - The set of already visited components. --/// \param RequiredLibs [out] - The ordered list of required libraries. -+/// \param RequiredLibs [out] - The ordered list of required -+/// libraries. -+/// \param GetComponentNames - Get the component names instead of the -+/// library name. - static void VisitComponent(StringRef Name, - const StringMap<AvailableComponent*> &ComponentMap, - std::set<AvailableComponent*> &VisitedComponents, - std::vector<StringRef> &RequiredLibs, -- bool IncludeNonInstalled) { -+ bool IncludeNonInstalled, bool GetComponentNames, -+ const std::string *ActiveLibDir, bool *HasMissing) { - // Lookup the component. - AvailableComponent *AC = ComponentMap.lookup(Name); - assert(AC && "Invalid component name!"); -@@ -74,12 +79,22 @@ static void VisitComponent(StringRef Name, - // Otherwise, visit all the dependencies. - for (unsigned i = 0; AC->RequiredLibraries[i]; ++i) { - VisitComponent(AC->RequiredLibraries[i], ComponentMap, VisitedComponents, -- RequiredLibs, IncludeNonInstalled); -+ RequiredLibs, IncludeNonInstalled, GetComponentNames, -+ ActiveLibDir, HasMissing); -+ } -+ -+ if (GetComponentNames) { -+ RequiredLibs.push_back(Name); -+ return; - } - - // Add to the required library list. -- if (AC->Library) -+ if (AC->Library) { -+ if (!IncludeNonInstalled && HasMissing && !*HasMissing && ActiveLibDir) { -+ *HasMissing = !sys::fs::exists(*ActiveLibDir + "/" + AC->Library); -+ } - RequiredLibs.push_back(AC->Library); -+ } - } - - /// \brief Compute the list of required libraries for a given list of -@@ -91,9 +106,12 @@ static void VisitComponent(StringRef Name, - /// are required to link the given components. - /// \param IncludeNonInstalled - Whether non-installed components should be - /// reported. -+/// \param GetComponentNames - True if one would prefer the component names. - static void ComputeLibsForComponents(const std::vector<StringRef> &Components, - std::vector<StringRef> &RequiredLibs, -- bool IncludeNonInstalled) { -+ bool IncludeNonInstalled, bool GetComponentNames, -+ const std::string *ActiveLibDir, -+ bool *HasMissing) { - std::set<AvailableComponent*> VisitedComponents; - - // Build a map of component names to information. -@@ -116,7 +134,8 @@ static void ComputeLibsForComponents(const std::vector<StringRef> &Components, - } - - VisitComponent(ComponentLower, ComponentMap, VisitedComponents, -- RequiredLibs, IncludeNonInstalled); -+ RequiredLibs, IncludeNonInstalled, GetComponentNames, -+ ActiveLibDir, HasMissing); - } - - // The list is now ordered with leafs first, we want the libraries to printed -@@ -157,6 +176,7 @@ Options:\n\ - --host-target Target triple used to configure LLVM.\n\ - --build-mode Print build mode of LLVM tree (e.g. Debug or Release).\n\ - --assertion-mode Print assertion mode of LLVM tree (ON or OFF).\n\ -+ --shared-mode Print how the provided components can be collectively linked (`shared` or `static`).\n\ - --build-system Print the build system used to build LLVM (autoconf or cmake).\n\ - Typical components:\n\ - all All LLVM libraries (default).\n\ -@@ -172,10 +192,38 @@ std::string GetExecutablePath(const char *Argv0) { - return llvm::sys::fs::getMainExecutable(Argv0, P); - } - -+/// \brief Expand the semi-colon delimited LLVM_DYLIB_COMPONENTS into -+/// the full list of components. -+std::vector<StringRef> GetAllDyLibComponents(const bool IsInDevelopmentTree, -+ const bool GetComponentNames) { -+ std::vector<StringRef> DyLibComponents; -+ { -+ StringRef DyLibComponentsStr(LLVM_DYLIB_COMPONENTS); -+ size_t Offset = 0; -+ while (true) { -+ const size_t NextOffset = DyLibComponentsStr.find(';', Offset); -+ DyLibComponents.push_back(DyLibComponentsStr.substr(Offset, NextOffset)); -+ if (NextOffset == std::string::npos) { -+ break; -+ } -+ Offset = NextOffset + 1; -+ } -+ -+ assert(DyLibComponents.size() > 0); -+ } -+ -+ std::vector<StringRef> Components; -+ ComputeLibsForComponents(DyLibComponents, Components, -+ /*IncludeNonInstalled=*/IsInDevelopmentTree, -+ GetComponentNames, nullptr, nullptr); -+ -+ return std::move(Components); -+} -+ - int main(int argc, char **argv) { - std::vector<StringRef> Components; - bool PrintLibs = false, PrintLibNames = false, PrintLibFiles = false; -- bool PrintSystemLibs = false; -+ bool PrintSystemLibs = false, PrintSharedMode = false; - bool HasAnyOption = false; - - // llvm-config is designed to support being run both from a development tree -@@ -270,6 +318,108 @@ int main(int argc, char **argv) { - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - -+ /// We only use `shared library` mode in cases where the static library form -+ /// of the components provided are not available; note however that this is -+ /// skipped if we're run from within the build dir. However, once installed, -+ /// we still need to provide correct output when the static archives are -+ /// removed or, as in the case of CMake's `BUILD_SHARED_LIBS`, never present -+ /// in the first place. This can't be done at configure/build time. -+ -+ StringRef SharedExt, SharedVersionedExt, SharedDir, SharedPrefix, StaticExt, -+ StaticPrefix, StaticDir = "lib"; -+ const Triple HostTriple(Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE)); -+ if (HostTriple.isOSWindows()) { -+ SharedExt = "dll"; -+ SharedVersionedExt = PACKAGE_VERSION ".dll"; -+ StaticExt = "a"; -+ SharedDir = ActiveBinDir; -+ StaticDir = ActiveLibDir; -+ StaticPrefix = SharedPrefix = ""; -+ } else if (HostTriple.isOSDarwin()) { -+ SharedExt = "dylib"; -+ SharedVersionedExt = PACKAGE_VERSION ".dylib"; -+ StaticExt = "a"; -+ StaticDir = SharedDir = ActiveLibDir; -+ StaticPrefix = SharedPrefix = "lib"; -+ } else { -+ // default to the unix values: -+ SharedExt = "so"; -+ SharedVersionedExt = PACKAGE_VERSION ".so"; -+ StaticExt = "a"; -+ StaticDir = SharedDir = ActiveLibDir; -+ StaticPrefix = SharedPrefix = "lib"; -+ } -+ -+ const bool BuiltDyLib = (std::strcmp(LLVM_ENABLE_DYLIB, "ON") == 0); -+ -+ enum { CMake, AutoConf } ConfigTool; -+ if (std::strcmp(LLVM_BUILD_SYSTEM, "cmake") == 0) { -+ ConfigTool = CMake; -+ } else { -+ ConfigTool = AutoConf; -+ } -+ -+ /// CMake style shared libs, ie each component is in a shared library. -+ const bool BuiltSharedLibs = -+ (ConfigTool == CMake && std::strcmp(LLVM_ENABLE_SHARED, "ON") == 0); -+ -+ bool DyLibExists = false; -+ const std::string DyLibName = -+ (SharedPrefix + "LLVM-" + SharedVersionedExt).str(); -+ -+ if (BuiltDyLib) { -+ DyLibExists = sys::fs::exists(SharedDir + "/" + DyLibName); -+ } -+ -+ /// Get the component's library name without the lib prefix and the -+ /// extension. Returns true if Lib is in a recognized format. -+ auto GetComponentLibraryNameSlice = [&](const StringRef &Lib, -+ StringRef &Out) { -+ if (Lib.startswith("lib")) { -+ unsigned FromEnd; -+ if (Lib.endswith(StaticExt)) { -+ FromEnd = StaticExt.size() + 1; -+ } else if (Lib.endswith(SharedExt)) { -+ FromEnd = SharedExt.size() + 1; -+ } else { -+ FromEnd = 0; -+ } -+ -+ if (FromEnd != 0) { -+ Out = Lib.slice(3, Lib.size() - FromEnd); -+ return true; -+ } -+ } -+ -+ return false; -+ }; -+ /// Maps Unixizms to the host platform. -+ auto GetComponentLibraryFileName = [&](const StringRef &Lib, -+ const bool ForceShared) { -+ std::string LibFileName = Lib; -+ StringRef LibName; -+ if (GetComponentLibraryNameSlice(Lib, LibName)) { -+ if (BuiltSharedLibs || ForceShared) { -+ LibFileName = (SharedPrefix + LibName + "." + SharedExt).str(); -+ } else { -+ // default to static -+ LibFileName = (StaticPrefix + LibName + "." + StaticExt).str(); -+ } -+ } -+ -+ return LibFileName; -+ }; -+ /// Get the full path for a possibly shared component library. -+ auto GetComponentLibraryPath = [&](const StringRef &Name, -+ const bool ForceShared) { -+ auto LibFileName = GetComponentLibraryFileName(Name, ForceShared); -+ if (BuiltSharedLibs || ForceShared) { -+ return (SharedDir + "/" + LibFileName).str(); -+ } else { -+ return (StaticDir + "/" + LibFileName).str(); -+ } -+ }; -+ - raw_ostream &OS = outs(); - for (int i = 1; i != argc; ++i) { - StringRef Arg = argv[i]; -@@ -303,13 +453,33 @@ int main(int argc, char **argv) { - } else if (Arg == "--libfiles") { - PrintLibFiles = true; - } else if (Arg == "--components") { -+ /// If there are missing static archives and a dylib was -+ /// built, print LLVM_DYLIB_COMPONENTS instead of everything -+ /// in the manifest. -+ std::vector<StringRef> Components; - for (unsigned j = 0; j != array_lengthof(AvailableComponents); ++j) { - // Only include non-installed components when in a development tree. - if (!AvailableComponents[j].IsInstalled && !IsInDevelopmentTree) - continue; - -- OS << ' '; -- OS << AvailableComponents[j].Name; -+ Components.push_back(AvailableComponents[j].Name); -+ if (AvailableComponents[j].Library && !IsInDevelopmentTree) { -+ if (DyLibExists && -+ !sys::fs::exists(GetComponentLibraryPath( -+ AvailableComponents[j].Library, false))) { -+ Components = GetAllDyLibComponents(IsInDevelopmentTree, true); -+ std::sort(Components.begin(), Components.end()); -+ break; -+ } -+ } -+ } -+ -+ for (unsigned I = 0; I < Components.size(); ++I) { -+ if (I) { -+ OS << ' '; -+ } -+ -+ OS << Components[I]; - } - OS << '\n'; - } else if (Arg == "--targets-built") { -@@ -324,6 +494,8 @@ int main(int argc, char **argv) { - #else - OS << "ON\n"; - #endif -+ } else if (Arg == "--shared-mode") { -+ PrintSharedMode = true; - } else if (Arg == "--build-system") { - OS << LLVM_BUILD_SYSTEM << '\n'; - } else if (Arg == "--obj-root") { -@@ -341,35 +513,84 @@ int main(int argc, char **argv) { - if (!HasAnyOption) - usage(); - -- if (PrintLibs || PrintLibNames || PrintLibFiles || PrintSystemLibs) { -+ if (PrintLibs || PrintLibNames || PrintLibFiles || PrintSystemLibs || -+ PrintSharedMode) { -+ -+ if (PrintSharedMode && BuiltSharedLibs) { -+ OS << "shared\n"; -+ return 0; -+ } -+ - // If no components were specified, default to "all". - if (Components.empty()) - Components.push_back("all"); - - // Construct the list of all the required libraries. - std::vector<StringRef> RequiredLibs; -+ bool HasMissing = false; - ComputeLibsForComponents(Components, RequiredLibs, -- /*IncludeNonInstalled=*/IsInDevelopmentTree); -+ /*IncludeNonInstalled=*/IsInDevelopmentTree, false, -+ &ActiveLibDir, &HasMissing); -+ -+ if (PrintSharedMode) { -+ std::unordered_set<std::string> FullDyLibComponents; -+ std::vector<StringRef> DyLibComponents = -+ GetAllDyLibComponents(IsInDevelopmentTree, false); -+ -+ for (auto &Component : DyLibComponents) { -+ FullDyLibComponents.insert(Component); -+ } -+ DyLibComponents.clear(); -+ -+ for (auto &Lib : RequiredLibs) { -+ if (!FullDyLibComponents.count(Lib)) { -+ OS << "static\n"; -+ return 0; -+ } -+ } -+ FullDyLibComponents.clear(); -+ -+ if (HasMissing && DyLibExists) { -+ OS << "shared\n"; -+ return 0; -+ } else { -+ OS << "static\n"; -+ return 0; -+ } -+ } - - if (PrintLibs || PrintLibNames || PrintLibFiles) { -- for (unsigned i = 0, e = RequiredLibs.size(); i != e; ++i) { -- StringRef Lib = RequiredLibs[i]; -- if (i) -- OS << ' '; - -+ auto PrintForLib = [&](const StringRef &Lib, const bool ForceShared) { - if (PrintLibNames) { -- OS << Lib; -+ OS << GetComponentLibraryFileName(Lib, ForceShared); - } else if (PrintLibFiles) { -- OS << ActiveLibDir << '/' << Lib; -+ OS << GetComponentLibraryPath(Lib, ForceShared); - } else if (PrintLibs) { - // If this is a typical library name, include it using -l. -- if (Lib.startswith("lib") && Lib.endswith(".a")) { -- OS << "-l" << Lib.slice(3, Lib.size()-2); -- continue; -+ StringRef LibName; -+ if (Lib.startswith("lib")) { -+ if (GetComponentLibraryNameSlice(Lib, LibName)) { -+ OS << "-l" << LibName; -+ } else { -+ OS << "-l:" << GetComponentLibraryFileName(Lib, ForceShared); -+ } -+ } else { -+ // Otherwise, print the full path. -+ OS << GetComponentLibraryPath(Lib, ForceShared); - } -+ } -+ }; -+ -+ if (HasMissing && DyLibExists) { -+ PrintForLib(DyLibName, true); -+ } else { -+ for (unsigned i = 0, e = RequiredLibs.size(); i != e; ++i) { -+ StringRef Lib = RequiredLibs[i]; -+ if (i) -+ OS << ' '; - -- // Otherwise, print the full path. -- OS << ActiveLibDir << '/' << Lib; -+ PrintForLib(Lib, false); - } - } - OS << '\n'; --- -2.7.4 - diff --git a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-2.patch b/sys-devel/llvm/files/llvm-3.7.1-llvm-config-2.patch deleted file mode 100644 index 2895d38..0000000 --- a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-2.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 4abc261d14c886c21d24f639293a60ce45c1dca3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 2 Dec 2015 16:04:56 +0100 -Subject: [PATCH 3/4] llvm-config: Clean up exported values, update for shared - linking - -Gentoo-specific fixup for llvm-config, including: -- wiping build-specific CFLAGS, CXXFLAGS, -- updating library suffixes for shared libs, -- wiping --system-libs for shared linking, -- banning --obj-root and --src-root due to no sources installed, -- making --build-mode return "Release" rather than "Gentoo". - -Thanks to Steven Newbury for the initial patch. - -Bug: https://bugs.gentoo.org/565358 -Bug: https://bugs.gentoo.org/501684 ---- - tools/llvm-config/CMakeLists.txt | 11 ++++++++--- - tools/llvm-config/llvm-config.cpp | 20 +++++++++++++++----- - utils/llvm-build/llvmbuild/main.py | 4 +++- - 3 files changed, 26 insertions(+), 9 deletions(-) - -diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index 173f6dc..013ea8c 100644 ---- a/tools/llvm-config/CMakeLists.txt -+++ b/tools/llvm-config/CMakeLists.txt -@@ -22,14 +22,19 @@ get_property(COMPILE_FLAGS TARGET llvm-config PROPERTY COMPILE_FLAGS) - set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR}) - set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) - set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") -+# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler -+# specific flags will be set when we don't know what compiler will be used -+# with external project utilising llvm-config. C++ Standard is required. -+# TODO: figure out if we can remove -std=c++11 and move it to revdeps. -+set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -+set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") - set(LLVM_BUILD_SYSTEM cmake) - - # Use the C++ link flags, since they should be a superset of C link flags. - set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") - set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) --set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) -+# We don't do static libs, so we don't need to supply any system-libs -+set(LLVM_SYSTEM_LIBS "") - if(BUILD_SHARED_LIBS) - set(LLVM_ENABLE_SHARED ON) - else() -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 51efbd8..315e5e1 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -487,7 +487,8 @@ int main(int argc, char **argv) { - } else if (Arg == "--host-target") { - OS << Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE) << '\n'; - } else if (Arg == "--build-mode") { -- OS << build_mode << '\n'; -+ // force Release since we force non-standard Gentoo build mode -+ OS << "Release" << '\n'; - } else if (Arg == "--assertion-mode") { - #if defined(NDEBUG) - OS << "OFF\n"; -@@ -498,10 +499,19 @@ int main(int argc, char **argv) { - PrintSharedMode = true; - } else if (Arg == "--build-system") { - OS << LLVM_BUILD_SYSTEM << '\n'; -- } else if (Arg == "--obj-root") { -- OS << ActivePrefix << '\n'; -- } else if (Arg == "--src-root") { -- OS << LLVM_SRC_ROOT << '\n'; -+ } else if (Arg == "--obj-root" || Arg == "--src-root") { -+ if (IsInDevelopmentTree) { -+ if (Arg == "--obj-root") { -+ OS << ActivePrefix << '\n'; -+ } else { -+ OS << LLVM_SRC_ROOT << '\n'; -+ } -+ } else { -+ // sources are not installed -+ llvm::errs() << "llvm-config: sources not installed, " -+ << Arg << " not available\n"; -+ exit(1); -+ } - } else { - usage(); - } -diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py -index 353741f..4ba5e91 100644 ---- a/utils/llvm-build/llvmbuild/main.py -+++ b/utils/llvm-build/llvmbuild/main.py -@@ -393,6 +393,8 @@ subdirectories = %s - // - //===----------------------------------------------------------------------===// - -+#include "llvm/Config/config.h" -+ - """) - f.write('struct AvailableComponent {\n') - f.write(' /// The name of the component.\n') -@@ -413,7 +415,7 @@ subdirectories = %s - if library_name is None: - library_name_as_cstr = '0' - else: -- library_name_as_cstr = '"lib%s.a"' % library_name -+ library_name_as_cstr = '"lib%s" LTDL_SHLIB_EXT' % library_name - f.write(' { "%s", %s, %d, { %s } },\n' % ( - name, library_name_as_cstr, is_installed, - ', '.join('"%s"' % dep --- -2.7.4 - diff --git a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-3.patch b/sys-devel/llvm/files/llvm-3.7.1-llvm-config-3.patch deleted file mode 100644 index 7a1547e..0000000 --- a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-3.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9308d1858852bdc6f099025ca0482d7b3a32a9aa Mon Sep 17 00:00:00 2001 -From: NAKAMURA Takumi <geek4civic@gmail.com> -Date: Wed, 10 Feb 2016 01:12:55 +0000 -Subject: [PATCH 4/4] llvm-config: Quick fix for cross compilation. Don't be - confsed between host and target. It has been there since r252532. - -FIXME: The clause may use conditions of host compiler, not HOST_TRIPLE. - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@260343 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - tools/llvm-config/llvm-config.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 315e5e1..346c9d9 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -327,7 +327,7 @@ int main(int argc, char **argv) { - - StringRef SharedExt, SharedVersionedExt, SharedDir, SharedPrefix, StaticExt, - StaticPrefix, StaticDir = "lib"; -- const Triple HostTriple(Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE)); -+ const Triple HostTriple(Triple::normalize(LLVM_HOST_TRIPLE)); - if (HostTriple.isOSWindows()) { - SharedExt = "dll"; - SharedVersionedExt = PACKAGE_VERSION ".dll"; --- -2.7.4 - diff --git a/sys-devel/llvm/files/llvm-3.8-lldb_six.patch b/sys-devel/llvm/files/llvm-3.8-lldb_six.patch deleted file mode 100644 index 324f2b8..0000000 --- a/sys-devel/llvm/files/llvm-3.8-lldb_six.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur llvm-3.8.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py llvm-3.8.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py ---- llvm-3.8.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py 2015-12-11 16:43:36.000000000 +0100 -+++ llvm-3.8.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py 2016-03-09 14:12:15.614483414 +0100 -@@ -720,9 +720,6 @@ - bOk, strMsg = create_symlinks(vDictArgs, strFrameworkPythonDir) - - if bOk: -- bOk, strMsg = copy_six(vDictArgs, strFrameworkPythonDir) -- -- if bOk: - bOk, strMsg = copy_lldbpy_file_to_lldb_pkg_dir(vDictArgs, - strFrameworkPythonDir, - strCfgBldDir) diff --git a/sys-devel/llvm/files/llvm-3.8-llvm-config.patch b/sys-devel/llvm/files/llvm-3.8-llvm-config.patch deleted file mode 100644 index 3eace43..0000000 --- a/sys-devel/llvm/files/llvm-3.8-llvm-config.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5ed05738769643b7c652f798fa6c3aa30c7f0b2b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 2 Dec 2015 16:04:56 +0100 -Subject: [PATCH] llvm-config: Clean up exported values, update for shared - linking - -Gentoo-specific fixup for llvm-config, including: -- wiping build-specific CFLAGS, CXXFLAGS, -- updating library suffixes for shared libs, -- wiping --system-libs for shared linking, -- banning --obj-root and --src-root due to no sources installed, -- making --build-mode return "Release" rather than "Gentoo". - -Thanks to Steven Newbury for the initial patch. - -Bug: https://bugs.gentoo.org/565358 -Bug: https://bugs.gentoo.org/501684 ---- - tools/llvm-config/CMakeLists.txt | 11 ++++++++--- - tools/llvm-config/llvm-config.cpp | 20 +++++++++++++++----- - utils/llvm-build/llvmbuild/main.py | 4 +++- - 3 files changed, 26 insertions(+), 9 deletions(-) - -diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index 83794bb..eba6f45 100644 ---- a/tools/llvm-config/CMakeLists.txt -+++ b/tools/llvm-config/CMakeLists.txt -@@ -22,15 +22,20 @@ get_property(COMPILE_FLAGS TARGET llvm-config PROPERTY COMPILE_FLAGS) - set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR}) - set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) - set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") -+# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler -+# specific flags will be set when we don't know what compiler will be used -+# with external project utilising llvm-config. C++ Standard is required. -+# TODO: figure out if we can remove -std=c++11 and move it to revdeps. -+set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -+set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") - set(LLVM_BUILD_SYSTEM cmake) - set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI}) - - # Use the C++ link flags, since they should be a superset of C link flags. - set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") - set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) --set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) -+# We don't do static libs, so we don't need to supply any system-libs -+set(LLVM_SYSTEM_LIBS "") - if(BUILD_SHARED_LIBS) - set(LLVM_ENABLE_SHARED ON) - else() -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 80f6279..5c65c57 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -484,7 +484,8 @@ int main(int argc, char **argv) { - } else if (Arg == "--host-target") { - OS << Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE) << '\n'; - } else if (Arg == "--build-mode") { -- OS << build_mode << '\n'; -+ // force Release since we force non-standard Gentoo build mode -+ OS << "Release" << '\n'; - } else if (Arg == "--assertion-mode") { - #if defined(NDEBUG) - OS << "OFF\n"; -@@ -497,10 +498,19 @@ int main(int argc, char **argv) { - OS << LLVM_HAS_RTTI << '\n'; - } else if (Arg == "--shared-mode") { - PrintSharedMode = true; -- } else if (Arg == "--obj-root") { -- OS << ActivePrefix << '\n'; -- } else if (Arg == "--src-root") { -- OS << LLVM_SRC_ROOT << '\n'; -+ } else if (Arg == "--obj-root" || Arg == "--src-root") { -+ if (IsInDevelopmentTree) { -+ if (Arg == "--obj-root") { -+ OS << ActivePrefix << '\n'; -+ } else { -+ OS << LLVM_SRC_ROOT << '\n'; -+ } -+ } else { -+ // sources are not installed -+ llvm::errs() << "llvm-config: sources not installed, " -+ << Arg << " not available\n"; -+ exit(1); -+ } - } else { - usage(); - } -diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py -index f2472f6..c89c77a 100644 ---- a/utils/llvm-build/llvmbuild/main.py -+++ b/utils/llvm-build/llvmbuild/main.py -@@ -393,6 +393,8 @@ subdirectories = %s - // - //===----------------------------------------------------------------------===// - -+#include "llvm/Config/config.h" -+ - """) - f.write('struct AvailableComponent {\n') - f.write(' /// The name of the component.\n') -@@ -413,7 +415,7 @@ subdirectories = %s - if library_name is None: - library_name_as_cstr = 'nullptr' - else: -- library_name_as_cstr = '"lib%s.a"' % library_name -+ library_name_as_cstr = '"lib%s" LTDL_SHLIB_EXT' % library_name - if is_installed: - is_installed_as_cstr = 'true' - else: --- -2.7.4 - diff --git a/sys-devel/llvm/files/llvm-3.8-soversion.patch b/sys-devel/llvm/files/llvm-3.8-soversion.patch deleted file mode 100644 index 1a30643..0000000 --- a/sys-devel/llvm/files/llvm-3.8-soversion.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3da7d5f7f928aa2aa5e7436b27908bb7e7eb3cc1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 28 Mar 2016 22:21:19 +0200 -Subject: [PATCH] cmake: Restore SOVERSIONs on shared libraries - ---- - cmake/modules/AddLLVM.cmake | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index a829751..a7e0688 100644 ---- a/cmake/modules/AddLLVM.cmake -+++ b/cmake/modules/AddLLVM.cmake -@@ -436,6 +436,11 @@ function(llvm_add_library name) - PREFIX "" - ) - endif() -+ -+ set_target_properties(${name} -+ PROPERTIES -+ SOVERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR} -+ VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX}) - endif() - - if(ARG_MODULE OR ARG_SHARED) --- -2.7.4 - diff --git a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch b/sys-devel/llvm/files/llvm-3.9-llvm-config.patch deleted file mode 100644 index d4363ad..0000000 --- a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch +++ /dev/null @@ -1,68 +0,0 @@ -From af798c5a6e4b2c6c98cce89b5d6fc8d33f9345cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 2 Dec 2015 16:04:56 +0100 -Subject: [PATCH 1/2] llvm-config: Clean up exported values, update for shared - linking - -Gentoo-specific fixup for llvm-config, including: -- wiping build-specific CFLAGS, CXXFLAGS, -- updating library suffixes for shared libs, -- wiping --system-libs for shared linking, -- banning --obj-root and --src-root due to no sources installed, -- making --build-mode return "Release" rather than "Gentoo". - -Thanks to Steven Newbury for the initial patch. - -Bug: https://bugs.gentoo.org/565358 -Bug: https://bugs.gentoo.org/501684 ---- - tools/llvm-config/CMakeLists.txt | 11 ++++++++--- - tools/llvm-config/llvm-config.cpp | 20 +++++++++++++++----- - 2 files changed, 23 insertions(+), 8 deletions(-) - -diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index 32d0f4c..6e99832 100644 ---- a/tools/llvm-config/CMakeLists.txt -+++ b/tools/llvm-config/CMakeLists.txt -@@ -29,2 +29,6 @@ set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_ --set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") -+# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler -+# specific flags will be set when we don't know what compiler will be used -+# with external project utilising llvm-config. C++ Standard is required. -+# TODO: figure out if we can remove -std=c++11 and move it to revdeps. -+set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -+set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -@@ -39 +43,2 @@ set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) --set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) -+# We don't do static libs, so we don't need to supply any system-libs -+set(LLVM_SYSTEM_LIBS "") -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 94d426b..fb1bdfa 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -525 +525,2 @@ int main(int argc, char **argv) { -- OS << build_mode << '\n'; -+ // force Release since we force non-standard Gentoo build mode -+ OS << "Release" << '\n'; -@@ -540,4 +541,13 @@ int main(int argc, char **argv) { -- } else if (Arg == "--obj-root") { -- OS << ActivePrefix << '\n'; -- } else if (Arg == "--src-root") { -- OS << LLVM_SRC_ROOT << '\n'; -+ } else if (Arg == "--obj-root" || Arg == "--src-root") { -+ if (IsInDevelopmentTree) { -+ if (Arg == "--obj-root") { -+ OS << ActivePrefix << '\n'; -+ } else { -+ OS << LLVM_SRC_ROOT << '\n'; -+ } -+ } else { -+ // sources are not installed -+ llvm::errs() << "llvm-config: sources not installed, " -+ << Arg << " not available\n"; -+ exit(1); -+ } --- -2.7.4 - diff --git a/sys-devel/llvm/llvm-3.7.1-r1.ebuild b/sys-devel/llvm/llvm-3.7.1-r1.ebuild deleted file mode 100644 index 58b7c72..0000000 --- a/sys-devel/llvm/llvm-3.7.1-r1.ebuild +++ /dev/null @@ -1,553 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -PYTHON_COMPAT=( python2_7 ) - -inherit check-reqs cmake-utils eutils flag-o-matic multilib linux-info \ - multilib-minimal python-single-r1 toolchain-funcs pax-utils prefix - -DESCRIPTION="Low Level Virtual Machine" -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 - http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz ) - lldb? ( http://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz ) - !doc? ( http://dev.gentoo.org/~voyageur/distfiles/${PN}-3.7.0-manpages.tar.bz2 )" - -LICENSE="UoI-NCSA" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml - python +static-analyzer test xml video_cards_radeon - kernel_Darwin kernel_FreeBSD rap" - -COMMON_DEPEND=" - sys-libs/zlib:0= - clang? ( - python? ( ${PYTHON_DEPS} ) - static-analyzer? ( - dev-lang/perl:* - ${PYTHON_DEPS} - ) - xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) - ) - gold? ( >=sys-devel/binutils-2.22:*[cxx] ) - libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) - libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] ) - ocaml? ( - >=dev-lang/ocaml-4.00.0:0= - dev-ml/findlib - dev-ml/ocaml-ctypes - !!<=sys-devel/llvm-3.7.0-r1[ocaml] )" -# configparser-3.2 breaks the build (3.3 or none at all are fine) -DEPEND="${COMMON_DEPEND} - dev-lang/perl - >=sys-devel/make-3.81 - >=sys-devel/flex-2.5.4 - >=sys-devel/bison-1.875d - || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 - ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) - ) - || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) - kernel_Darwin? ( <sys-libs/libcxx-${PV%_rc*}.9999 ) - clang? ( xml? ( virtual/pkgconfig ) ) - doc? ( dev-python/sphinx ) - gold? ( sys-libs/binutils-libs ) - libffi? ( virtual/pkgconfig ) - lldb? ( dev-lang/swig ) - !!<dev-python/configparser-3.3.0.2 - ocaml? ( test? ( dev-ml/ounit ) ) - ${PYTHON_DEPS}" -RDEPEND="${COMMON_DEPEND} - clang? ( !<=sys-devel/clang-${PV}-r99 ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" -PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )" - -# pypy gives me around 1700 unresolved tests due to open file limit -# being exceeded. probably GC does not close them fast enough. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - lldb? ( clang xml )" - -S=${WORKDIR}/${P/_}.src - -pkg_pretend() { - # in megs - # !clang !debug !multitarget -O2 400 - # !clang !debug multitarget -O2 550 - # clang !debug !multitarget -O2 950 - # clang !debug multitarget -O2 1200 - # !clang debug multitarget -O2 5G - # clang !debug multitarget -O0 -g 12G - # clang debug multitarget -O2 16G - # clang debug multitarget -O0 -g 14G - - local build_size=550 - use clang && build_size=1200 - - if use debug; then - ewarn "USE=debug is known to increase the size of package considerably" - ewarn "and cause the tests to fail." - ewarn - - (( build_size *= 14 )) - elif is-flagq '-g?(gdb)?([1-9])'; then - ewarn "The C++ compiler -g option is known to increase the size of the package" - ewarn "considerably. If you run out of space, please consider removing it." - ewarn - - (( build_size *= 10 )) - fi - - # Multiply by number of ABIs :). - local abis=( $(multilib_get_enabled_abis) ) - (( build_size *= ${#abis[@]} )) - - local CHECKREQS_DISK_BUILD=${build_size}M - check-reqs_pkg_pretend -} - -pkg_setup() { - pkg_pretend -} - -src_unpack() { - default - - if use clang; then - mv "${WORKDIR}"/cfe-${PV/_}.src "${S}"/tools/clang \ - || die "clang source directory move failed" - mv "${WORKDIR}"/compiler-rt-${PV/_}.src "${S}"/projects/compiler-rt \ - || die "compiler-rt source directory move failed" - mv "${WORKDIR}"/clang-tools-extra-${PV/_}.src "${S}"/tools/clang/tools/extra \ - || die "clang-tools-extra source directory move failed" - fi - - if use lldb; then - mv "${WORKDIR}"/lldb-${PV/_}.src "${S}"/tools/lldb \ - || die "lldb source directory move failed" - fi -} - -src_prepare() { - # Make ocaml warnings non-fatal, bug #537308 - sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die - # Fix libdir for ocaml bindings install, bug #559134 - eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch - # Do not build/install ocaml docs with USE=-doc, bug #562008 - eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch - - # Make it possible to override Sphinx HTML install dirs - # https://llvm.org/bugs/show_bug.cgi?id=23780 - eapply "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch - - # Prevent race conditions with parallel Sphinx runs - # https://llvm.org/bugs/show_bug.cgi?id=23781 - eapply "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch - - # Prevent installing libgtest - # https://llvm.org/bugs/show_bug.cgi?id=18341 - eapply "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch - - # Fix llvm-config for shared linking, sane flags and return values - # in order: - # - backported r247159 that adds --build-system (needed for later code) - # - backported r252532 that adds better shared linking support - # - our fixes - # - backported r260343 that fixes cross-compilation - # combination of backported upstream r252532 with our patch - # https://bugs.gentoo.org/show_bug.cgi?id=565358 - eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-0.patch - eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-1.patch - eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-2.patch - eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-3.patch - - # Fix msan with newer kernels, #569894 - eapply "${FILESDIR}"/llvm-3.7-msan-fix.patch - - # disable use of SDK on OSX, bug #568758 - sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die - - if use clang; then - # Automatically select active system GCC's libraries, bugs #406163 and #417913 - eapply "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch - - eapply "${FILESDIR}"/clang-3.6-gentoo-install.patch - - eapply "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch - eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp - - sed -i -e "s^@EPREFIX@^${EPREFIX}^" \ - tools/clang/tools/scan-build/scan-build || die - - # Install clang runtime into /usr/lib/clang - # https://llvm.org/bugs/show_bug.cgi?id=23792 - eapply "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch - eapply "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch - - # Do not force -march flags on arm platforms - # https://bugs.gentoo.org/show_bug.cgi?id=562706 - eapply "${FILESDIR}"/cmake/${PN}-3.7.0-compiler_rt_arm_march_flags.patch - - # Make it possible to override CLANG_LIBDIR_SUFFIX - # (that is used only to find LLVMgold.so) - # https://llvm.org/bugs/show_bug.cgi?id=23793 - eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch - - pushd projects/compiler-rt >/dev/null || die - - # Fix msan with newer kernels, compiler-rt part, #569894 - eapply "${FILESDIR}"/compiler-rt-3.7-msan-fix.patch - - # Fix WX sections, bug #421527 - find lib/builtins -type f -name '*.S' -exec sed \ - -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \ - -i {} + || die - - popd >/dev/null || die - fi - - if use lldb; then - # Do not install dummy readline.so module from - # https://llvm.org/bugs/show_bug.cgi?id=18841 - sed -e 's/add_subdirectory(readline)/#&/' \ - -i tools/lldb/scripts/Python/modules/CMakeLists.txt || die - - # Fix Python paths, bugs #562436 and #562438 - eapply "${FILESDIR}"/${PN}-3.7-lldb_python.patch - sed -e "s/GENTOO_LIBDIR/$(get_libdir)/" \ - -i tools/lldb/scripts/Python/finishSwigPythonLLDB.py || die - - # Fix build with ncurses[tinfo], #560474 - # http://llvm.org/viewvc/llvm-project?view=revision&revision=247842 - eapply "${FILESDIR}"/cmake/${PN}-3.7.0-lldb_tinfo.patch - fi - - # User patches - eapply_user - - if kernel_is -lt 2 6 32; then - # on RHEL5, linux/perf_event.h (needing kernel >=2.6.32) is not available. - # https://llvm.org/bugs/show_bug.cgi?id=17901 - elog "Removing compiler-rt on <linux-2.6.32..." - rm -r projects/compiler-rt || die "Removing compiler-rt failed." - fi - - python_setup - - # Native libdir is used to hold LLVMgold.so - NATIVE_LIBDIR=$(get_libdir) -} - -multilib_src_configure() { - local targets - if use multitarget; then - targets=all - else - targets='host;BPF;CppBackend' - use video_cards_radeon && targets+=';AMDGPU' - fi - - local ffi_cflags ffi_ldflags - if use libffi; then - ffi_cflags=$(pkg-config --cflags-only-I libffi) - ffi_ldflags=$(pkg-config --libs-only-L libffi) - fi - - local libdir=$(get_libdir) - local mycmakeargs=( - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - - -DBUILD_SHARED_LIBS=ON - -DLLVM_ENABLE_TIMESTAMPS=OFF - -DLLVM_TARGETS_TO_BUILD="${targets}" - -DLLVM_BUILD_TESTS=$(usex test) - - -DLLVM_ENABLE_FFI=$(usex libffi) - -DLLVM_ENABLE_TERMINFO=$(usex ncurses) - -DLLVM_ENABLE_ASSERTIONS=$(usex debug) - -DLLVM_ENABLE_EH=ON - -DLLVM_ENABLE_RTTI=ON - - -DWITH_POLLY=OFF # TODO - - -DLLVM_HOST_TRIPLE="${CHOST}" - - -DFFI_INCLUDE_DIR="${ffi_cflags#-I}" - -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}" - - -DHAVE_HISTEDIT_H=$(usex libedit) - ) - - use rap && mycmakeargs+=( -DDEFAULT_SYSROOT="${EPREFIX}" ) - - if use clang; then - mycmakeargs+=( - -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml) - # libgomp support fails to find headers without explicit -I - # furthermore, it provides only syntax checking - -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp - ) - fi - - if use lldb; then - mycmakeargs+=( - -DLLDB_DISABLE_LIBEDIT=$(usex !libedit) - -DLLDB_DISABLE_CURSES=$(usex !ncurses) - -DLLDB_ENABLE_TERMINFO=$(usex ncurses) - ) - fi - - if ! multilib_is_native_abi || ! use ocaml; then - mycmakeargs+=( - -DOCAMLFIND=NO - ) - fi -# Note: go bindings have no CMake rules at the moment -# but let's kill the check in case they are introduced -# if ! multilib_is_native_abi || ! use go; then - mycmakeargs+=( - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND - ) -# fi - - if multilib_is_native_abi; then - mycmakeargs+=( - -DLLVM_BUILD_DOCS=$(usex doc) - -DLLVM_ENABLE_SPHINX=$(usex doc) - -DLLVM_ENABLE_DOXYGEN=OFF - -DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html" - -DSPHINX_WARNINGS_AS_ERRORS=OFF - -DLLVM_INSTALL_UTILS=ON - ) - - if use clang; then - mycmakeargs+=( - -DCLANG_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/clang" - ) - fi - - if use gold; then - mycmakeargs+=( - -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include - ) - fi - - if use lldb; then - mycmakeargs+=( - -DLLDB_DISABLE_PYTHON=$(usex !python) - ) - fi - - else - if use clang; then - mycmakeargs+=( - # disable compiler-rt on non-native ABI because: - # 1. it fails to configure because of -m32 - # 2. it is shared between ABIs so no point building - # it multiple times - -DLLVM_EXTERNAL_COMPILER_RT_BUILD=OFF - -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_BUILD=OFF - ) - fi - if use lldb; then - mycmakeargs+=( - # only run swig on native abi - -DLLDB_DISABLE_PYTHON=ON - ) - fi - fi - - if use clang; then - mycmakeargs+=( - -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) - -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) - -DCLANG_LIBDIR_SUFFIX="${NATIVE_LIBDIR#lib}" - ) - - # -- not needed when compiler-rt is built with host compiler -- - # cmake passes host C*FLAGS to compiler-rt build - # which is performed using clang, so we need to filter out - # some flags clang does not support - # (if you know some more flags that don't work, let us know) - #filter-flags -msahf -frecord-gcc-switches - fi - - cmake-utils_src_configure -} - -multilib_src_compile() { - cmake-utils_src_compile - # TODO: not sure why this target is not correctly called - multilib_is_native_abi && use doc && use ocaml && cmake-utils_src_make docs/ocaml_doc - - pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld - pax-mark m "${BUILD_DIR}"/bin/lli - pax-mark m "${BUILD_DIR}"/bin/lli-child-target - - if use test; then - pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests - pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests - pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests - fi -} - -multilib_src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - local test_targets=( check ) - # clang tests won't work on non-native ABI because we skip compiler-rt - multilib_is_native_abi && use clang && test_targets+=( check-clang ) - cmake-utils_src_make "${test_targets[@]}" -} - -src_install() { - local MULTILIB_CHOST_TOOLS=( - /usr/bin/llvm-config - ) - - local MULTILIB_WRAPPED_HEADERS=( - /usr/include/llvm/Config/config.h - /usr/include/llvm/Config/llvm-config.h - ) - - if use clang; then - # note: magic applied in multilib_src_install()! - CLANG_VERSION=${PV%.*} - - MULTILIB_CHOST_TOOLS+=( - /usr/bin/clang - /usr/bin/clang++ - /usr/bin/clang-cl - /usr/bin/clang-${CLANG_VERSION} - /usr/bin/clang++-${CLANG_VERSION} - /usr/bin/clang-cl-${CLANG_VERSION} - ) - - MULTILIB_WRAPPED_HEADERS+=( - /usr/include/clang/Config/config.h - ) - fi - - multilib-minimal_src_install - - # Remove unnecessary headers on FreeBSD, bug #417171 - if use kernel_FreeBSD && use clang; then - rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h || die - fi -} - -multilib_src_install() { - cmake-utils_src_install - - if multilib_is_native_abi; then - # Install man pages. - use doc || doman "${WORKDIR}"/${PN}-3.7.0-manpages/*.1 - - # Symlink the gold plugin. - if use gold; then - dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins" - dosym "../../../../$(get_libdir)/LLVMgold.so" \ - "/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so" - fi - fi - - # apply CHOST and CLANG_VERSION to clang executables - # they're statically linked so we don't have to worry about the lib - if use clang; then - local clang_tools=( clang clang++ clang-cl ) - local i - - # cmake gives us: - # - clang-X.Y - # - clang -> clang-X.Y - # - clang++, clang-cl -> clang - # we want to have: - # - clang-X.Y - # - clang++-X.Y, clang-cl-X.Y -> clang-X.Y - # - clang, clang++, clang-cl -> clang*-X.Y - # so we need to fix the two tools - for i in "${clang_tools[@]:1}"; do - rm "${ED%/}/usr/bin/${i}" || die - dosym "clang-${CLANG_VERSION}" "/usr/bin/${i}-${CLANG_VERSION}" - dosym "${i}-${CLANG_VERSION}" "/usr/bin/${i}" - done - - # now prepend ${CHOST} and let the multilib-build.eclass symlink it - if ! multilib_is_native_abi; then - # non-native? let's replace it with a simple wrapper - for i in "${clang_tools[@]}"; do - rm "${ED%/}/usr/bin/${i}-${CLANG_VERSION}" || die - cat > "${T}"/wrapper.tmp <<-_EOF_ - #!${EPREFIX}/bin/sh - exec "${i}-${CLANG_VERSION}" $(get_abi_CFLAGS) "\${@}" - _EOF_ - newbin "${T}"/wrapper.tmp "${i}-${CLANG_VERSION}" - done - fi - fi -} - -multilib_src_install_all() { - insinto /usr/share/vim/vimfiles - doins -r utils/vim/*/. - # some users may find it useful - dodoc utils/vim/vimrc - - if use clang; then - pushd tools/clang >/dev/null || die - - if use static-analyzer ; then - pushd tools/scan-build >/dev/null || die - - dobin ccc-analyzer scan-build - dosym ccc-analyzer /usr/bin/c++-analyzer - doman scan-build.1 - - insinto /usr/share/llvm - doins scanview.css sorttable.js - - popd >/dev/null || die - fi - - if use static-analyzer ; then - pushd tools/scan-view >/dev/null || die - - python_doscript scan-view - - touch __init__.py || die - python_moduleinto clang - python_domodule *.py Resources - - popd >/dev/null || die - fi - - if use python ; then - pushd bindings/python/clang >/dev/null || die - - python_moduleinto clang - python_domodule *.py - - popd >/dev/null || die - fi - - popd >/dev/null || die - - python_fix_shebang "${ED}" - if use lldb && use python; then - python_optimize - fi - fi -} - -pkg_postinst() { - if use clang && ! has_version sys-libs/libomp; then - elog "To enable OpenMP support in clang, install sys-libs/libomp." - fi -} diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild deleted file mode 100644 index 428bf9e..0000000 --- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild +++ /dev/null @@ -1,543 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -PYTHON_COMPAT=( python2_7 ) - -inherit check-reqs cmake-utils eutils flag-o-matic multilib linux-info \ - multilib-minimal python-single-r1 toolchain-funcs pax-utils prefix - -DESCRIPTION="Low Level Virtual Machine" -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 - http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz ) - lldb? ( http://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz ) - !doc? ( http://dev.gentoo.org/~voyageur/distfiles/${PN}-3.8.0-manpages.tar.bz2 )" - -LICENSE="UoI-NCSA" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml - python +static-analyzer test xml video_cards_radeon - kernel_Darwin kernel_FreeBSD" - -COMMON_DEPEND=" - sys-libs/zlib:0= - clang? ( - python? ( ${PYTHON_DEPS} ) - static-analyzer? ( - dev-lang/perl:* - ${PYTHON_DEPS} - ) - xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) - ) - gold? ( >=sys-devel/binutils-2.22:*[cxx] ) - libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) - libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) - lldb? ( dev-python/six[${PYTHON_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] ) - ocaml? ( - >=dev-lang/ocaml-4.00.0:0= - dev-ml/findlib - dev-ml/ocaml-ctypes - !!<=sys-devel/llvm-3.7.0-r1[ocaml] )" -# configparser-3.2 breaks the build (3.3 or none at all are fine) -DEPEND="${COMMON_DEPEND} - dev-lang/perl - >=sys-devel/make-3.81 - >=sys-devel/flex-2.5.4 - >=sys-devel/bison-1.875d - || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 - ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) - ) - || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) - kernel_Darwin? ( <sys-libs/libcxx-${PV%_rc*}.9999 ) - clang? ( xml? ( virtual/pkgconfig ) ) - doc? ( dev-python/sphinx ) - gold? ( sys-libs/binutils-libs ) - libffi? ( virtual/pkgconfig ) - lldb? ( dev-lang/swig ) - !!<dev-python/configparser-3.3.0.2 - ocaml? ( test? ( dev-ml/ounit ) ) - ${PYTHON_DEPS}" -RDEPEND="${COMMON_DEPEND} - clang? ( !<=sys-devel/clang-${PV}-r99 ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" -PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )" - -# pypy gives me around 1700 unresolved tests due to open file limit -# being exceeded. probably GC does not close them fast enough. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - lldb? ( clang xml )" - -S=${WORKDIR}/${P/_}.src - -pkg_pretend() { - # in megs - # !clang !debug !multitarget -O2 400 - # !clang !debug multitarget -O2 550 - # clang !debug !multitarget -O2 950 - # clang !debug multitarget -O2 1200 - # !clang debug multitarget -O2 5G - # clang !debug multitarget -O0 -g 12G - # clang debug multitarget -O2 16G - # clang debug multitarget -O0 -g 14G - - local build_size=550 - use clang && build_size=1200 - - if use debug; then - ewarn "USE=debug is known to increase the size of package considerably" - ewarn "and cause the tests to fail." - ewarn - - (( build_size *= 14 )) - elif is-flagq '-g?(gdb)?([1-9])'; then - ewarn "The C++ compiler -g option is known to increase the size of the package" - ewarn "considerably. If you run out of space, please consider removing it." - ewarn - - (( build_size *= 10 )) - fi - - # Multiply by number of ABIs :). - local abis=( $(multilib_get_enabled_abis) ) - (( build_size *= ${#abis[@]} )) - - local CHECKREQS_DISK_BUILD=${build_size}M - check-reqs_pkg_pretend -} - -pkg_setup() { - pkg_pretend -} - -src_unpack() { - default - - if use clang; then - mv "${WORKDIR}"/cfe-${PV/_}.src "${S}"/tools/clang \ - || die "clang source directory move failed" - mv "${WORKDIR}"/compiler-rt-${PV/_}.src "${S}"/projects/compiler-rt \ - || die "compiler-rt source directory move failed" - mv "${WORKDIR}"/clang-tools-extra-${PV/_}.src "${S}"/tools/clang/tools/extra \ - || die "clang-tools-extra source directory move failed" - fi - - if use lldb; then - mv "${WORKDIR}"/lldb-${PV/_}.src "${S}"/tools/lldb \ - || die "lldb source directory move failed" - fi -} - -src_prepare() { - python_setup - - # Make ocaml warnings non-fatal, bug #537308 - sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die - # Fix libdir for ocaml bindings install, bug #559134 - eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch - # Do not build/install ocaml docs with USE=-doc, bug #562008 - eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch - - # Make it possible to override Sphinx HTML install dirs - # https://llvm.org/bugs/show_bug.cgi?id=23780 - eapply "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch - - # Prevent race conditions with parallel Sphinx runs - # https://llvm.org/bugs/show_bug.cgi?id=23781 - eapply "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch - - # Prevent installing libgtest - # https://llvm.org/bugs/show_bug.cgi?id=18341 - eapply "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch - - # Allow custom cmake build types (like 'Gentoo') - eapply "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch - - # Fix llvm-config for shared linking and sane flags - # https://bugs.gentoo.org/show_bug.cgi?id=565358 - eapply "${FILESDIR}"/llvm-3.8-llvm-config.patch - - # Restore SOVERSIONs for shared libraries - # https://bugs.gentoo.org/show_bug.cgi?id=578392 - eapply "${FILESDIR}"/llvm-3.8-soversion.patch - - # disable use of SDK on OSX, bug #568758 - sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die - - # Workaround, can be compiled with gcc on Gentoo/FreeBSD, bug #578064 - use kernel_FreeBSD && tc-is-gcc && append-cppflags "-D_GLIBCXX_USE_C99" - - if use clang; then - # Automatically select active system GCC's libraries, bugs #406163 and #417913 - eapply "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch - - # Support gcc4.9 search paths - # https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3 - eapply "${FILESDIR}"/clang-3.8-gcc4.9-search-path.patch - - eapply "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch - eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp - - sed -i -e "s^@EPREFIX@^${EPREFIX}^" \ - tools/clang/tools/scan-build/bin/scan-build || die - - # Install clang runtime into /usr/lib/clang - # https://llvm.org/bugs/show_bug.cgi?id=23792 - eapply "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch - eapply "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch - - # Do not force -march flags on arm platforms - # https://bugs.gentoo.org/show_bug.cgi?id=562706 - eapply "${FILESDIR}"/cmake/${PN}-3.8.0-compiler_rt_arm_march_flags.patch - - # Make it possible to override CLANG_LIBDIR_SUFFIX - # (that is used only to find LLVMgold.so) - # https://llvm.org/bugs/show_bug.cgi?id=23793 - eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch - - # Fix git-clang-format shebang, bug #562688 - python_fix_shebang tools/clang/tools/clang-format/git-clang-format - - # Fix 'stdarg.h' file not found on Gentoo/FreeBSD, bug #578064 - # https://llvm.org/bugs/show_bug.cgi?id=26651 - eapply "${FILESDIR}"/clang-3.8-compiler-rt-fbsd.patch - - pushd projects/compiler-rt >/dev/null || die - - # Fix WX sections, bug #421527 - find lib/builtins -type f -name '*.S' -exec sed \ - -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \ - -i {} + || die - - popd >/dev/null || die - fi - - if use lldb; then - # Do not install dummy readline.so module from - # https://llvm.org/bugs/show_bug.cgi?id=18841 - sed -e 's/add_subdirectory(readline)/#&/' \ - -i tools/lldb/scripts/Python/modules/CMakeLists.txt || die - # Do not install bundled six module - eapply "${FILESDIR}"/${PN}-3.8-lldb_six.patch - fi - - # User patches - eapply_user - - if kernel_is -lt 2 6 32; then - # on RHEL5, linux/perf_event.h (needing kernel >=2.6.32) is not available. - # https://llvm.org/bugs/show_bug.cgi?id=17901 - elog "Removing compiler-rt on <linux-2.6.32..." - rm -r projects/compiler-rt || die "Removing compiler-rt failed." - fi - - # Native libdir is used to hold LLVMgold.so - NATIVE_LIBDIR=$(get_libdir) -} - -multilib_src_configure() { - local targets - if use multitarget; then - targets=all - else - targets='host;BPF;CppBackend' - use video_cards_radeon && targets+=';AMDGPU' - fi - - local ffi_cflags ffi_ldflags - if use libffi; then - ffi_cflags=$(pkg-config --cflags-only-I libffi) - ffi_ldflags=$(pkg-config --libs-only-L libffi) - fi - - local libdir=$(get_libdir) - local mycmakeargs=( - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - - -DBUILD_SHARED_LIBS=ON - -DLLVM_ENABLE_TIMESTAMPS=OFF - -DLLVM_TARGETS_TO_BUILD="${targets}" - -DLLVM_BUILD_TESTS=$(usex test) - - -DLLVM_ENABLE_FFI=$(usex libffi) - -DLLVM_ENABLE_TERMINFO=$(usex ncurses) - -DLLVM_ENABLE_ASSERTIONS=$(usex debug) - -DLLVM_ENABLE_EH=ON - -DLLVM_ENABLE_RTTI=ON - - -DWITH_POLLY=OFF # TODO - - -DLLVM_HOST_TRIPLE="${CHOST}" - - -DFFI_INCLUDE_DIR="${ffi_cflags#-I}" - -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}" - - -DHAVE_HISTEDIT_H=$(usex libedit) - ) - - use prefix && mycmakeargs+=( -DDEFAULT_SYSROOT="${EPREFIX}" ) - - if use clang; then - mycmakeargs+=( - -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml) - # libgomp support fails to find headers without explicit -I - # furthermore, it provides only syntax checking - -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp - ) - fi - - if use lldb; then - mycmakeargs+=( - -DLLDB_DISABLE_LIBEDIT=$(usex !libedit) - -DLLDB_DISABLE_CURSES=$(usex !ncurses) - -DLLDB_ENABLE_TERMINFO=$(usex ncurses) - ) - fi - - if ! multilib_is_native_abi || ! use ocaml; then - mycmakeargs+=( - -DOCAMLFIND=NO - ) - fi -# Note: go bindings have no CMake rules at the moment -# but let's kill the check in case they are introduced -# if ! multilib_is_native_abi || ! use go; then - mycmakeargs+=( - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND - ) -# fi - - if multilib_is_native_abi; then - mycmakeargs+=( - -DLLVM_BUILD_DOCS=$(usex doc) - -DLLVM_ENABLE_SPHINX=$(usex doc) - -DLLVM_ENABLE_DOXYGEN=OFF - -DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html" - -DSPHINX_WARNINGS_AS_ERRORS=OFF - -DLLVM_INSTALL_UTILS=ON - ) - - if use clang; then - mycmakeargs+=( - -DCLANG_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/clang" - ) - fi - - if use gold; then - mycmakeargs+=( - -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include - ) - fi - - if use lldb; then - mycmakeargs+=( - -DLLDB_DISABLE_PYTHON=$(usex !python) - ) - fi - - else - if use clang; then - mycmakeargs+=( - # disable compiler-rt on non-native ABI because: - # 1. it fails to configure because of -m32 - # 2. it is shared between ABIs so no point building - # it multiple times - -DLLVM_EXTERNAL_COMPILER_RT_BUILD=OFF - -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_BUILD=OFF - ) - fi - if use lldb; then - mycmakeargs+=( - # only run swig on native abi - -DLLDB_DISABLE_PYTHON=ON - ) - fi - fi - - if use clang; then - mycmakeargs+=( - -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) - -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) - -DCLANG_LIBDIR_SUFFIX="${NATIVE_LIBDIR#lib}" - ) - - # -- not needed when compiler-rt is built with host compiler -- - # cmake passes host C*FLAGS to compiler-rt build - # which is performed using clang, so we need to filter out - # some flags clang does not support - # (if you know some more flags that don't work, let us know) - #filter-flags -msahf -frecord-gcc-switches - fi - - if tc-is-cross-compiler; then - [[ -x "/usr/bin/llvm-tblgen" ]] \ - || die "/usr/bin/llvm-tblgen not found or usable" - mycmakeargs+=( - -DCMAKE_CROSSCOMPILING=ON - -DLLVM_TABLEGEN=/usr/bin/llvm-tblgen - ) - - if use clang; then - [[ -x "/usr/bin/clang-tblgen" ]] \ - || die "/usr/bin/clang-tblgen not found or usable" - mycmakeargs+=( - -DCLANG_TABLEGEN=/usr/bin/clang-tblgen - ) - fi - fi - - cmake-utils_src_configure -} - -multilib_src_compile() { - cmake-utils_src_compile - # TODO: not sure why this target is not correctly called - multilib_is_native_abi && use doc && use ocaml && cmake-utils_src_make docs/ocaml_doc - - pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld - pax-mark m "${BUILD_DIR}"/bin/lli - pax-mark m "${BUILD_DIR}"/bin/lli-child-target - - if use test; then - pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests - pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests - pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests - fi -} - -multilib_src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - local test_targets=( check ) - # clang tests won't work on non-native ABI because we skip compiler-rt - multilib_is_native_abi && use clang && test_targets+=( check-clang ) - cmake-utils_src_make "${test_targets[@]}" -} - -src_install() { - local MULTILIB_CHOST_TOOLS=( - /usr/bin/llvm-config - ) - - local MULTILIB_WRAPPED_HEADERS=( - /usr/include/llvm/Config/config.h - /usr/include/llvm/Config/llvm-config.h - ) - - if use clang; then - # note: magic applied in multilib_src_install()! - CLANG_VERSION=${PV%.*} - - MULTILIB_CHOST_TOOLS+=( - /usr/bin/clang - /usr/bin/clang++ - /usr/bin/clang-cl - /usr/bin/clang-${CLANG_VERSION} - /usr/bin/clang++-${CLANG_VERSION} - /usr/bin/clang-cl-${CLANG_VERSION} - ) - - MULTILIB_WRAPPED_HEADERS+=( - /usr/include/clang/Config/config.h - ) - fi - - multilib-minimal_src_install - - # Remove unnecessary headers on FreeBSD, bug #417171 - if use kernel_FreeBSD && use clang; then - rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h || die - fi -} - -multilib_src_install() { - cmake-utils_src_install - - if multilib_is_native_abi; then - # Install man pages. - use doc || doman "${WORKDIR}"/${PN}-3.8.0-manpages/*.1 - - # Symlink the gold plugin. - if use gold; then - dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins" - dosym "../../../../$(get_libdir)/LLVMgold.so" \ - "/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so" - fi - fi - - # apply CHOST and CLANG_VERSION to clang executables - # they're statically linked so we don't have to worry about the lib - if use clang; then - local clang_tools=( clang clang++ clang-cl ) - local i - - # cmake gives us: - # - clang-X.Y - # - clang -> clang-X.Y - # - clang++, clang-cl -> clang - # we want to have: - # - clang-X.Y - # - clang++-X.Y, clang-cl-X.Y -> clang-X.Y - # - clang, clang++, clang-cl -> clang*-X.Y - # so we need to fix the two tools - for i in "${clang_tools[@]:1}"; do - rm "${ED%/}/usr/bin/${i}" || die - dosym "clang-${CLANG_VERSION}" "/usr/bin/${i}-${CLANG_VERSION}" - dosym "${i}-${CLANG_VERSION}" "/usr/bin/${i}" - done - - # now prepend ${CHOST} and let the multilib-build.eclass symlink it - if ! multilib_is_native_abi; then - # non-native? let's replace it with a simple wrapper - for i in "${clang_tools[@]}"; do - rm "${ED%/}/usr/bin/${i}-${CLANG_VERSION}" || die - cat > "${T}"/wrapper.tmp <<-_EOF_ - #!${EPREFIX}/bin/sh - exec "${i}-${CLANG_VERSION}" $(get_abi_CFLAGS) "\${@}" - _EOF_ - newbin "${T}"/wrapper.tmp "${i}-${CLANG_VERSION}" - done - fi - fi -} - -multilib_src_install_all() { - insinto /usr/share/vim/vimfiles - doins -r utils/vim/*/. - # some users may find it useful - dodoc utils/vim/vimrc - - if use clang; then - pushd tools/clang >/dev/null || die - - if use python ; then - pushd bindings/python/clang >/dev/null || die - - python_moduleinto clang - python_domodule *.py - - popd >/dev/null || die - fi - - popd >/dev/null || die - - python_fix_shebang "${ED}" - if use static-analyzer; then - python_optimize "${ED}"usr/share/scan-view - fi - fi -} - -pkg_postinst() { - if use clang && ! has_version 'sys-libs/libomp'; then - elog "To enable OpenMP support in clang, install sys-libs/libomp." - fi -} diff --git a/sys-devel/llvm/metadata.xml b/sys-devel/llvm/metadata.xml deleted file mode 100644 index 6d78a05..0000000 --- a/sys-devel/llvm/metadata.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> - <longdescription>Low Level Virtual Machine (LLVM) is: - 1. A compilation strategy designed to enable effective program optimization across the entire lifetime of a program. LLVM supports effective optimization at compile time, link-time (particularly interprocedural), run-time and offline (i.e., after software is installed), while remaining transparent to developers and maintaining compatibility with existing build scripts. - 2. A virtual instruction set - LLVM is a low-level object code representation that uses simple RISC-like instructions, but provides rich, language-independent, type information and dataflow (SSA) information about operands. This combination enables sophisticated transformations on object code, while remaining light-weight enough to be attached to the executable. This combination is key to allowing link-time, run-time, and offline transformations. - 3. A compiler infrastructure - LLVM is also a collection of source code that implements the language and compilation strategy. The primary components of the LLVM infrastructure are a GCC-based C and C++ front-end, a link-time optimization framework with a growing set of global and interprocedural analyses and transformations, static back-ends for many popular (and some obscure) architectures, a back-end which emits portable C code, and a Just-In-Time compilers for several architectures. - 4. LLVM does not imply things that you would expect from a high-level virtual machine. It does not require garbage collection or run-time code generation (In fact, LLVM makes a great static compiler!). Note that optional LLVM components can be used to build high-level virtual machines and other systems that need these services.</longdescription> - <use> - <flag name="clang">Build the clang C/C++ compiler</flag> - <flag name="cmake">Enable cmake support (experimental)</flag> - <flag name="doc">Build and install the HTML documentation and regenerate the man pages</flag> - <flag name="gold">Build the gold linker plugin</flag> - <flag name="lldb">Build the lldb debugger</flag> - <flag name="multitarget">Build all host targets (default: host only)</flag> - <flag name="ncurses">Support querying terminal properties using ncurses' terminfo</flag> - <flag name="static-analyzer">Install the Clang static analyzer (requires USE=clang)</flag> - <flag name="udis86">Enable support for <pkg>dev-libs/udis86</pkg> disassembler library</flag> - </use> -</pkgmetadata> diff --git a/sys-fs/posixovl/Manifest b/sys-fs/posixovl/Manifest deleted file mode 100644 index 6b709d5..0000000 --- a/sys-fs/posixovl/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST posixovl-1.2.tar.xz 14980 SHA256 e936a06d06b65319c0efe5402597682b1ae86e6df15e60d00d1c562390207f75 SHA512 67ef4074993a286c79ffafb31feb99e57819e39e73bbef100a5de381368d88d3b179a24b5a49102e29d4c4fe8134ea04e7b13b07f366873586d9e83877963244 WHIRLPOOL 343394b50ba86b3691b9b148be684793246efde71da012368a8e0d70390d00c5d5c0470f700f5657b3dcecfe4b79cf0b62bb9bb784b5b7251e9c726d8ba8a908 -EBUILD posixovl-1.2.ebuild 637 SHA256 06756d46dd2e63dcc7214bcd68f52ae9c4aa13026391cad0fe0d238d4851f6fc SHA512 3bbbda88499e54144c0cb514e0f820d5a1c2adc5d8f4790fd1f49e68feee5c2ea1e7ea0f2397ab0aac94a37892439f9b6cd68061cbd1331fe6360cb73525962c WHIRLPOOL bba6f95eaa43c304f49b256530158185c67715987cbcc39099620f1e8a27bd22af6dd005f9ce13cabc47da1656b418f5fe8b2a4c740267968a8bc6adcc280e4e diff --git a/sys-fs/posixovl/posixovl-1.2.ebuild b/sys-fs/posixovl/posixovl-1.2.ebuild deleted file mode 100644 index e7ddcc6..0000000 --- a/sys-fs/posixovl/posixovl-1.2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools flag-o-matic - -DESCRIPTION="A FUSE filesystem that provides POSIX functionality for filesystems that do not have such." -HOMEPAGE="http://sourceforge.net/projects/posixovl" -SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~x86" -SLOT=0 -IUSE="static" -RDEPEND=">=sys-fs/fuse-2.6.5 - sys-apps/attr" -DEPEND="${RDEPEND}" -S="${WORKDIR}/${PN}" - -src_prepare () { - if use static; then - append-flags -static - # libfuse.a calls dlopen - append-libs dl - fi - - eautoreconf -} diff --git a/sys-fs/unionfs-fuse/ChangeLog b/sys-fs/unionfs-fuse/ChangeLog deleted file mode 100644 index 9c0fb57..0000000 --- a/sys-fs/unionfs-fuse/ChangeLog +++ /dev/null @@ -1,44 +0,0 @@ -# ChangeLog for sys-fs/unionfs-fuse -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs-fuse/ChangeLog,v 1.9 2013/02/21 03:59:06 zmedico Exp $ - - 21 Feb 2013; Zac Medico <zmedico@gentoo.org> unionfs-fuse-0.26.ebuild: - Fix for prefix and add ~x86-linux keyword. - - 22 Sep 2012; Sebastian Pipping <sping@gentoo.org> unionfs-fuse-0.26.ebuild, - +files/unionfs-fuse-0.26-declare-chroot.patch, - +files/unionfs-fuse-0.26-link-pthread.patch: - Fix underlinking to pthreads with GCC 4.7 (bug #435822), mainly. Patches - forwarded to upstream. - - 14 Sep 2012; Sebastian Pipping <sping@gentoo.org> -unionfs-fuse-0.23.ebuild: - Remove 0.23 ebuilds since upstream now considers 0.23 to be severely broken - -*unionfs-fuse-0.26 (14 Sep 2012) - - 14 Sep 2012; Sebastian Pipping <sping@gentoo.org> +unionfs-fuse-0.26.ebuild: - Bump to 0.26, looks trivial - -*unionfs-fuse-0.25 (04 Feb 2012) - - 04 Feb 2012; Sebastian Pipping <sping@gentoo.org> +unionfs-fuse-0.25.ebuild: - Bump to 0.25 - -*unionfs-fuse-0.24 (21 May 2010) - - 21 May 2010; Sebastian Pipping <sping@gentoo.org> - +unionfs-fuse-0.24.ebuild: - Bump to 0.24 - - 18 Mar 2010; Sebastian Pipping <sping@gentoo.org> metadata.xml: - Put myself in as maintainer - - 17 Jan 2010; Alex Legler <a3li@gentoo.org> unionfs-fuse-0.23.ebuild: - Keyword ~amd64, bug 301207 by Martin Väth. - -*unionfs-fuse-0.23 (12 Jan 2010) - - 12 Jan 2010; Sebastian Pipping <sping@gentoo.org> - +unionfs-fuse-0.23.ebuild, +files/unionfs-fuse-0.23-makefile.patch, - +metadata.xml: - New package (fixes bug #143026) diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest deleted file mode 100644 index d13892f..0000000 --- a/sys-fs/unionfs-fuse/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX unionfs-fuse-0.23-makefile.patch 301 SHA256 006dbd58cf9bf017b11bea4a6dad3b45ac2636fd62c52d9fb03d71edc66300e5 SHA512 8b3f0e68a1f5a8b4bf0b238463934325095dcce36c0fe8f3a7df3f545883906aaa0cd3f73183ee9bcc6a6c9deae338e7c673421c8ffc8e367eb0e3c0e3c2341b WHIRLPOOL 3d0406ed3a654c111ac25ca37944118cfcf5d12265b6edcf1f3836171d7562dd921bd055f8e2e4396b5520a79b1a50eb581dfa470e3ef391141c826ec129aa44 -AUX unionfs-fuse-0.26-declare-chroot.patch 312 SHA256 402258decbba9057891eb25a6f75fd9c358113eccd3b1f9c32d18bedda123330 SHA512 103e082fbe0a65fb44838e530ee59644659deca1096d6125c20a7911eee2296bcca98ea8d14249d433337fd06ede4eac7d705029e6e70e2df35468998cf144ab WHIRLPOOL 8641cdc4032e2d7c03f39f389b6911e555a0a56eb21971a5d07b03fa02a6f4ca2126ab48255cba5761f8ffc723ac2c6ad054cd6561c056dc74c8e205c1e8a5f2 -AUX unionfs-fuse-0.26-link-pthread.patch 347 SHA256 32cb895e3fffa87c58efa5632dd6dfc07dd4a64b1b60942244bee3f58cc514bd SHA512 4f76f9221e1be47be2c4d405cfd1a326f1955697cfbc5932034e3d90e39c87375df86f7a38c740aa6a6b7fca96b141938a521b42c79a1da70d4ffc59c060e239 WHIRLPOOL c76e9cc7405c2112045601e5ff0897f55a540e13232af7d8634c57e808b6dd956b104e767861c35fd2847d8c7c70b803021b7e565cd8dbb3e4ced4c87203101a -DIST unionfs-fuse-0.24.tar.bz2 30381 SHA256 d8abc855eb618ac356b1e716599c82f8f0f74dbaee36d4062edc707567121937 SHA512 e0e414f4edbf641ec9d0135a8723e43fc75412359b482f7aedd66fe8245e4df03943c5ecb6f8de4fdbd97f0346033c691e766cc4f4a755f5b43748e1441d3fbd WHIRLPOOL dc132086d9614895961dc8b498c435145b4390fc80331e0575ee8420faea0201325ab2394b9090d8f721c602ef1f93e150573b1b88b77ee4f7be4a262103b986 -DIST unionfs-fuse-0.25.tar.bz2 30674 SHA256 a33f0a8c4ec35108f173a7a96463222534c21b3a50c167a7c868fc5723347e8f -DIST unionfs-fuse-0.26.tar.xz 38600 SHA256 8d5c9dcb51ecb9a9b03890e16d17e37d602b0c1f23ed6a9ddec2b0f719c9f662 SHA512 07805a2ca90354ed0f8feac3ab0005cc4bba64200172e019f00eb50786776c94a6f976a7c383b17b30373e628838ef94cced510d475d557cafb1a2b309d058f0 WHIRLPOOL e4db99e1eae6ae3bfccaf047411b71642b28a1aeaa5ce922934536fac5034e5941ea6e29299908aa54600b699c1ebc7da6b3601f5acab395b0b08d53a29bd09f -EBUILD unionfs-fuse-0.24.ebuild 664 SHA256 02faccbdd247bce0f8c2aea70e0d1ccb01b811f295e334db61d77ad4750d2a80 SHA512 058f25779c546745d12763af4eba5b7beded390ab0d667ad54d4384bc10113a9edf4d73052591d7cdf134bed0d18ebca379981b87f44c40d8db6320f01fa265e WHIRLPOOL 3d666e38fcc0472095697589d29925e7237a9a2ce2a3f2ce23aea560934113daf2e7e5cc4a679c11ca03feb737263f9300130700f3c0f42b889cd72dbe708549 -EBUILD unionfs-fuse-0.25.ebuild 664 SHA256 5832fe234bbdbad6103bed7fd85a2dd0eaf754c86eea1bf88a2049ca4382d411 SHA512 494358b2950ac49c073e52acd59d5ffaa32f56b2f0caef1dd4b850770bf288e8ba6c47a049e2208166a460556ca22c1b6ea149624308ae205878bdd6c373a2dc WHIRLPOOL b563f03557f5ab0254a2d86758d93a277c99a365f0659c7c727c1c9368d30e5ceb2d7e5ad5b65e6f2b5e25a2203c9571fe8bd6acf58a3c3ca1b510f3d051547d -EBUILD unionfs-fuse-0.26.ebuild 820 SHA256 0748197a4617b5cb9f4ab5bd8956ee0e89b5f5ec88a4e09c912cef61a835a885 SHA512 64f22115bea5cce4fbca118cd5e2018e521d14ad6cd1dd857824292d6bbb5efe8779efee5e7f6d13db8e7f75c6191f426d3c748410403afd8f92eb2230b094e5 WHIRLPOOL 461246718cc9a31a4eabd148aa25b547985548756960db4b0d978f4998e65e0f0ba32a2524dbdb82c84f10281c6800aab0cd1ca00bc0bbd696e2e23d0937c263 -MISC ChangeLog 1590 SHA256 847c3677223623a84c555653e860d7c8139009c077a7a371a7fac25c38e8f400 SHA512 0697cf3d3fc801b47ace4bed834b57b63fd89b47d1469cf648cb1eeba9eb80be436f090c185f822ae68bd8d2585d0a13ca84736d79763817e0bc5ccfa8652bcb WHIRLPOOL 6faf77f5bb637b3c5983fc619540f5c9718c7699dce54fac6a73a3c124f79b2fc31fa71bea5d60672ef95d6b044b1de66e2c5a2d7fb049e169a4d8cae2b1e589 -MISC metadata.xml 235 SHA256 095e4ee6b3ae673e7ddf0d4e166a632d3384d6374c6dd86d8c401a8f5c43f7fe SHA512 52fe834d5150301a0247d32806e487fa9838f30eb94e3d6cc2f10f2b574e95a113accdd2dd4097c2033a0dfc6da06948a3ea6e13f593f038c0d0e9e13ecbfdf5 WHIRLPOOL e070f37f0eab35b3b21bba900e3d710592720cdcf57f02bd9dcc8f7af418a152c36b22022af50d40d7267b7bf041739031135d65e66c6e9b9b31597d920d4364 diff --git a/sys-fs/unionfs-fuse/files/unionfs-fuse-0.23-makefile.patch b/sys-fs/unionfs-fuse/files/unionfs-fuse-0.23-makefile.patch deleted file mode 100644 index 6f80808..0000000 --- a/sys-fs/unionfs-fuse/files/unionfs-fuse-0.23-makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile_BACKUP 2010-01-12 01:26:33.000000000 +0100 -+++ Makefile 2010-01-12 01:26:58.000000000 +0100 -@@ -7,10 +7,10 @@ - LIB = -lfuse -lpthread -lm - - build: -- make -C src/ -+ $(MAKE) -C src/ - - clean: -- make -C src/ clean -+ $(MAKE) -C src/ clean - - install: build - cp src/unionfs $(DESTDIR)/sbin/ diff --git a/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-declare-chroot.patch b/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-declare-chroot.patch deleted file mode 100644 index e436f9f..0000000 --- a/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-declare-chroot.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- unionfs-fuse-0.26/src/unionfs.c 2012-09-22 22:24:05.090568485 +0200 -+++ unionfs-fuse-0.26/src/unionfs.c 2012-09-22 22:24:09.036519156 +0200 -@@ -13,6 +13,9 @@ - #ifdef linux - // For pread()/pwrite()/utimensat() - #define _XOPEN_SOURCE 700 -+ -+ // For chroot -+ #define _BSD_SOURCE - #endif - - #include <fuse.h> diff --git a/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-link-pthread.patch b/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-link-pthread.patch deleted file mode 100644 index 9bed29f..0000000 --- a/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-link-pthread.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile 2012-09-22 22:14:36.484677038 +0200 -+++ src/Makefile 2012-09-22 22:14:40.162631059 +0200 -@@ -5,7 +5,7 @@ - - LDFLAGS += - --LIB = $(shell pkg-config --libs fuse) -+LIB = $(shell pkg-config --libs fuse) -lpthread - - HASHTABLE_OBJ = hashtable.o hashtable_itr.o - UNIONFS_OBJ = unionfs.o stats.o opts.o debug.o findbranch.o readdir.o \ diff --git a/sys-fs/unionfs-fuse/metadata.xml b/sys-fs/unionfs-fuse/metadata.xml deleted file mode 100644 index 16bcc9f..0000000 --- a/sys-fs/unionfs-fuse/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>sping@gentoo.org</email> - <name>Sebastian Pipping</name> - </maintainer> -</pkgmetadata> diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-0.24.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-0.24.ebuild deleted file mode 100644 index 5cce212..0000000 --- a/sys-fs/unionfs-fuse/unionfs-fuse-0.24.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs-fuse/unionfs-fuse-0.24.ebuild,v 1.1 2010/05/21 16:54:29 sping Exp $ - -EAPI="2" - -DESCRIPTION="Self-syncing tree-merging file system based on FUSE" - -HOMEPAGE="http://podgorny.cz/moin/UnionFsFuse" -SRC_URI="http://podgorny.cz/unionfs-fuse/releases/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="sys-fs/fuse" -RDEPEND="${DEPEND}" - -src_install() { - dodir /usr/sbin /usr/share/man/man8/ || die "dodir failed" - emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed" -} diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-0.25.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-0.25.ebuild deleted file mode 100644 index f6bfdbc..0000000 --- a/sys-fs/unionfs-fuse/unionfs-fuse-0.25.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs-fuse/unionfs-fuse-0.25.ebuild,v 1.1 2012/02/04 01:15:07 sping Exp $ - -EAPI="2" - -DESCRIPTION="Self-syncing tree-merging file system based on FUSE" - -HOMEPAGE="http://podgorny.cz/moin/UnionFsFuse" -SRC_URI="http://podgorny.cz/unionfs-fuse/releases/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="sys-fs/fuse" -RDEPEND="${DEPEND}" - -src_install() { - dodir /usr/sbin /usr/share/man/man8/ || die "dodir failed" - emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed" -} diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-0.26.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-0.26.ebuild deleted file mode 100644 index 011f16e..0000000 --- a/sys-fs/unionfs-fuse/unionfs-fuse-0.26.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs-fuse/unionfs-fuse-0.26.ebuild,v 1.4 2013/02/21 03:59:06 zmedico Exp $ - -EAPI="3" - -inherit eutils - -DESCRIPTION="Self-syncing tree-merging file system based on FUSE" - -HOMEPAGE="http://podgorny.cz/moin/UnionFsFuse" -SRC_URI="http://podgorny.cz/unionfs-fuse/releases/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86 ~x86-linux" -IUSE="" - -DEPEND="sys-fs/fuse" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-link-pthread.patch - epatch "${FILESDIR}"/${P}-declare-chroot.patch -} - -src_install() { - dodir /usr/sbin /usr/share/man/man8/ || die "dodir failed" - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install || die "emake install failed" -} diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest deleted file mode 100644 index f319be2..0000000 --- a/sys-kernel/linux-headers/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX linux-2.6.28.10-unifdef-getline.patch 1770 SHA256 5a3c4f030e401dc344dee977e3afa7c19d325520b1e0111d2cba6b992d0e764b SHA512 034a8d8296697385a021ddc6d7c7faf465cda49dad9da62ab7121ecd44948de7354bb196a1fc50f7c53a1ed3df40fe2c0759d94660c392590813bcf81de4b46d WHIRLPOOL e5fb904958bea5c8dd0c2fd3b52956ee7d5fde9369c658ef936b7642849677a9bf7492e095175ddc160e59a5040f70abb00d8ae2c99bf1adabf99175ff5e0087 -DIST gentoo-headers-2.6.19.2-4.tar.bz2 8552 SHA256 62f3c00a384551e4bcdb0795dc512780e631aa2df3e9bd284a16ab95a7afac78 SHA512 f22eaed6237f1ab1cecffe516c5e042623c79e1d536b0ed897ccf50893de26a20c8f3f56102ed3e7c3864ca730974785e6dbf1050c7802ed2a4daff251acae7e WHIRLPOOL 41daf208c274b6da8dab42d77c16a72302e9ddfaad648db02ccdafcd43a5be4afe03e2983b9371e6c5d564c3aa2a5e10ff7ec55a5d88cf8dab059186f2a19137 -DIST gentoo-headers-base-2.6.19.2.tar.bz2 4324444 SHA256 c9e33b13e061fb063117ae6c690e90e4d0975d6c649dc214542bd78c31e2088e SHA512 72928ab8633dc2ef685faaa47ace246d2f59c411afcd723912cd6f0599c4fae7cbe86a1dfdf1119c053f79a4c90fc82d113b2a4d0e1b0b1150b7747994c2dd8d WHIRLPOOL ed0e957122b26a6a78f5c71f51a843869bfed20296d43c96f46bf0d07e7e8a91404aadff2bb93f80dc9baf5eeddfba714928eb6a8f1b18a4f926a65cd5716bbb -DIST linux-2.6.26.tar.xz 40704768 SHA256 c6f94b0c35c5e6e6a4fe031f9279661816e84e77f072c356867926e3dd354a81 SHA512 068356c1414de9228e8a677bf2d22fcab4f31408ff2e7ff0a53eca4ff3a47536570766a594cf6ed96ce1d1e78faae56ae0ef0909928ba3738657b3598358bc69 WHIRLPOOL b5c10fcda4c322140f7cafa4950416171111356595b1ae34e71d86b272dfd2f19e3e06c991872f1c7688a9da243fe5ff373ade1611ed9bffe146a63fee05f1f6 -EBUILD linux-headers-2.6.19.2-r2.ebuild 967 SHA256 8bff5751010778da8f2d559e0c21cea334cdd41f3344e790f424c00c961fcbe3 SHA512 2ab8cd98cc87acd5dab91abf3849675682736ac3f19a7b04443dd7075963318af38f692e9768b9600a822ddaaf964ae59651cc7628a55f14042b34b5580b1d23 WHIRLPOOL 647bb2450bb5f93fe0c32db2942d9e20503fa1766055cbe9710edcca064165dbf3cf27c3ab108697aaf8c60f1251b0d10d5f0c488733a4054514fc6bcfecf9af -EBUILD linux-headers-2.6.26.ebuild 466 SHA256 77c1b6654fd45757720e81d77040c794b2f85460528355a023f18149c2cf70bf SHA512 cc4ee96ce604f587a13b23a37065af7b06b1d30511eb7ce0f875b049eda01bae0e8f3e0f1b809205655adf2e2be81a051d54bdb09ebe0be721779a7734554c20 WHIRLPOOL 4b85b3addb866e301e9670bfc8dc498ffe5388f31de19e34109b81adb9afa799b4cb1593fd1037f41fc2cc3d1635c9760d5d526c2585f4c52a1743eb13dda8b3 diff --git a/sys-kernel/linux-headers/files/linux-2.6.28.10-unifdef-getline.patch b/sys-kernel/linux-headers/files/linux-2.6.28.10-unifdef-getline.patch deleted file mode 100644 index f4a4820..0000000 --- a/sys-kernel/linux-headers/files/linux-2.6.28.10-unifdef-getline.patch +++ /dev/null @@ -1,56 +0,0 @@ -From d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7 Mon Sep 17 00:00:00 2001 -From: Justin P. Mattock <justinmattock@gmail.com> -Date: Sat, 7 Mar 2009 13:31:29 +0100 -Subject: [PATCH] kbuild: fix C libary confusion in unifdef.c due to getline() - -This fixes an error when compiling the kernel. - - CHK include/linux/version.h - HOSTCC scripts/unifdef -scripts/unifdef.c:209: error: conflicting types for 'getline' -/usr/include/stdio.h:651: note: previous declaration of 'getline' was here -make[1]: *** [scripts/unifdef] Error 1 -make: *** [__headers] Error 2 - -Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> -Cc: Frederic Weisbecker <fweisbec@gmail.com> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Sam Ravnborg <sam@ravnborg.org> ---- - scripts/unifdef.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/scripts/unifdef.c b/scripts/unifdef.c -index 552025e..05a31a6 100644 ---- a/scripts/unifdef.c -+++ b/scripts/unifdef.c -@@ -206,7 +206,7 @@ static void done(void); - static void error(const char *); - static int findsym(const char *); - static void flushline(bool); --static Linetype getline(void); -+static Linetype get_line(void); - static Linetype ifeval(const char **); - static void ignoreoff(void); - static void ignoreon(void); -@@ -512,7 +512,7 @@ process(void) - - for (;;) { - linenum++; -- lineval = getline(); -+ lineval = get_line(); - trans_table[ifstate[depth]][lineval](); - debug("process %s -> %s depth %d", - linetype_name[lineval], -@@ -526,7 +526,7 @@ process(void) - * help from skipcomment(). - */ - static Linetype --getline(void) -+get_line(void) - { - const char *cp; - int cursym; --- -1.6.3.3 - diff --git a/sys-kernel/linux-headers/linux-headers-2.6.19.2-r2.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.19.2-r2.ebuild deleted file mode 100644 index be74e46..0000000 --- a/sys-kernel/linux-headers/linux-headers-2.6.19.2-r2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/Attic/linux-headers-2.6.19.2-r2.ebuild,v 1.7 2007/12/31 05:53:04 vapier dead $ - -ETYPE="headers" -H_SUPPORTEDARCH="alpha amd64 arm cris hppa m68k mips ia64 ppc ppc64 s390 sh sparc x86" -inherit kernel-2 -detect_version - -PATCH_VER="4" -SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.bz2" -[[ -n ${PATCH_VER} ]] && SRC_URI="${SRC_URI} mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.bz2" - -KEYWORDS="-* -alpha ~amd64 arm ~hppa ~ia64 m68k mips ~ppc ~ppc64 s390 sh sparc ~x86" - -DEPEND="dev-util/unifdef" -RDEPEND="" - -S=${WORKDIR}/gentoo-headers-base-${PV} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/linux-2.6.28.10-unifdef-getline.patch" - [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV} -} - -src_test() { - make ARCH=$(tc-arch-kernel) headers_check || die -} diff --git a/sys-kernel/linux-headers/linux-headers-2.6.26.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.26.ebuild deleted file mode 100644 index 768bdca..0000000 --- a/sys-kernel/linux-headers/linux-headers-2.6.26.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/Attic/linux-headers-2.6.18.ebuild,v 1.1 2006/10/08 20:02:13 vapier Exp $ - -EAPI=5 -ETYPE="headers" -H_SUPPORTEDARCH="alpha amd64 arm hppa m68k ia64 ppc ppc64 s390 sh sparc x86" -inherit eutils multilib kernel-2 -detect_version - -SRC_URI="${KERNEL_URI}" -KEYWORDS="-*" - -DEPEND="dev-util/unifdef" -RDEPEND="" diff --git a/sys-process/runit/ChangeLog b/sys-process/runit/ChangeLog deleted file mode 100644 index 17f30b9..0000000 --- a/sys-process/runit/ChangeLog +++ /dev/null @@ -1,128 +0,0 @@ -# ChangeLog for sys-process/runit -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/ChangeLog,v 1.34 2012/02/06 03:13:33 vapier Exp $ - - 06 Feb 2012; Mike Frysinger <vapier@gentoo.org> runit-2.1.1-r1.ebuild: - Don't run env-update in pkg_* funcs -- the PM does that. - -*runit-2.1.1-r1 (30 Nov 2011) - - 30 Nov 2011; Marc Schiffbauer <mschiff@gentoo.org> +runit-2.1.1-r1.ebuild: - Added rev 2.2.1-r1. Fixes #392453. - - 15 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org> runit-2.1.1.ebuild: - QA: actually make runit build, since it was broken with a blind version bump. - -*runit-2.1.1 (15 Jun 2011) - - 15 Jun 2011; Jeroen Roovers <jer@gentoo.org> +runit-2.1.1.ebuild: - Version bump. - -*runit-2.0.0 (25 Dec 2008) - - 25 Dec 2008; Mike Frysinger <vapier@gentoo.org> +runit-2.0.0.ebuild: - Version bump #190983 by Daniel Pielmeier (billie). - - 14 Oct 2008; Diego Pettenò <flameeyes@gentoo.org> runit-1.7.0.ebuild: - Set compiler and linker during src_compile rather than unpack. - - 12 May 2008; Markus Meier <maekke@gentoo.org> runit-1.7.0.ebuild: - amd64 stable, bug #216630 - - 14 Apr 2008; Jeroen Roovers <jer@gentoo.org> runit-1.7.0.ebuild: - Stable for HPPA (bug #216630). - - 12 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org> runit-1.7.0.ebuild: - ppc stable, bug #216630 - - 08 Apr 2008; Raúl Porcel <armin76@gentoo.org> runit-1.7.0.ebuild: - ia64/sparc/x86 stable wrt #216630 - - 07 Apr 2008; Tobias Klausmann <klausman@gentoo.org> runit-1.7.0.ebuild: - Stable on alpha, bug #216630 - - 07 Apr 2008; Brent Baude <ranger@gentoo.org> runit-1.7.0.ebuild: - stable ppc64, bug 216630 - -*runit-1.7.0 (25 Aug 2007) - - 25 Aug 2007; Mike Frysinger <vapier@gentoo.org> +runit-1.7.0.ebuild: - Version bump #180649 by Radek Podgorny. - - 03 Jul 2007; Raúl Porcel <armin76@gentoo.org> runit-1.5.0.ebuild: - alpha stable wrt #178046 - - 02 Jun 2007; Lars Weiler <pylon@gentoo.org> runit-1.5.0.ebuild: - Stable on ppc; bug #178046. - - 21 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> runit-1.5.0.ebuild: - Stable on sparc wrt #178046 - - 16 May 2007; Steve Dibb <beandog@gentoo.org> runit-1.5.0.ebuild: - amd64 stable, bug 178046 - - 15 May 2007; Jeroen Roovers <jer@gentoo.org> runit-1.5.0.ebuild: - Stable for HPPA (bug #178046). - - 13 May 2007; Raúl Porcel <armin76@gentoo.org> runit-1.5.0.ebuild: - ia64 + x86 stable wrt bug 178046 - - 13 May 2007; Markus Rothe <corsair@gentoo.org> runit-1.5.0.ebuild: - Stable on ppc64; bug #178046 - - 10 Apr 2007; Christian Faulhammer <opfer@gentoo.org> runit-1.3.0.ebuild: - stable amd64, bug 172203 - - 10 Apr 2007; Christian Faulhammer <opfer@gentoo.org> ChangeLog: - keyworded ~amd64, bug 172203 - - 09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: - Regenerate digest in Manifest2 format. - - 23 May 2006; Markus Rothe <corsair@gentoo.org> runit-1.3.0.ebuild: - Stable on ppc64 - -*runit-1.5.0 (20 Apr 2006) - - 20 Apr 2006; Mike Frysinger <vapier@gentoo.org> +runit-1.5.0.ebuild: - Version bump #130519 by Radek Podgorny. - - 20 Apr 2006; Mike Frysinger <vapier@gentoo.org> +files/3-1.4, - runit-1.4.1.ebuild: - New initscript by Radek Podgorny #128918. - -*runit-1.4.1 (29 Mar 2006) - - 29 Mar 2006; Mike Frysinger <vapier@gentoo.org> +runit-1.4.1.ebuild: - Version bump #127877 by Radek Podgorny. - - 08 Feb 2006; Aron Griffis <agriffis@gentoo.org> runit-1.3.0.ebuild: - Mark 1.3.0 stable on alpha - - 07 Feb 2006; Aron Griffis <agriffis@gentoo.org> runit-1.3.0.ebuild: - Mark 1.3.0 stable on ia64 - - 30 Jan 2006; Ian Leitch <port001@gentoo.org> runit-1.3.0.ebuild: - Stable on x86 (bug #120415). - -*runit-1.3.3 (15 Jan 2006) - - 15 Jan 2006; Mike Frysinger <vapier@gentoo.org> +runit-1.3.3.ebuild: - Version bump #119069 by Torne Wuff. - -*runit-1.3.0 (26 Jul 2005) - - 26 Jul 2005; Caleb Tennis <caleb@gentoo.org> +runit-1.3.0.ebuild: - Version bump - bug #100343 - -*runit-1.0.5 (03 Mar 2005) - - 03 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> +metadata.xml, +files/1, - +files/2, +files/3, +files/ctrlaltdel, +files/finish.getty, - +files/run.getty, +runit-1.0.5.ebuild: - Moved from sys-apps/runit to sys-process/runit. - -*runit-1.0.5 (09 Oct 2004) - - 09 Oct 2004; Mike Frysinger <vapier@gentoo.org> : - Initial import. Ebuild submitted by Torne Wuff #39160. diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest deleted file mode 100644 index aae017d..0000000 --- a/sys-process/runit/Manifest +++ /dev/null @@ -1,16 +0,0 @@ -AUX 1 175 RMD160 ca7ea65b85ec58b1ff07d50db47807339bcb509a SHA1 f92044c4f90e0bd588860fe2b314b074d97a2fa7 SHA256 fd9520369851473556c038b55679dcb1eb1265d1220e8c3cf4aac2dfae4e6594 -AUX 2 551 RMD160 192302cd579520d2f92f4db6295db9d8cbd56303 SHA1 bfa2f2a1e7ce6ab92d76301f7afb99bca41ba830 SHA256 d0cb35c4ecdd5ef9179af22f24cb371eb8f1082ec1af7850237842bd49ccba0f -AUX 3 377 RMD160 41baaa2fcb680c9ed17fe8fbda4b640473240540 SHA1 d1a8fdeb5d39acf42b0bea4eac45d19feda929aa SHA256 3f3787de54ead7c2450f596acf022c9f255a8e6dc1e6ea7bb3a5fea20fa63ac2 -AUX 3-1.4 372 RMD160 b62d35af10c481df7f2f38fb892858f3ddc382bb SHA1 bcb7ec8c6cb3dfabad4cc25ad34c8f575ef8bcd1 SHA256 56b835cb329e71d14523038cd382ad92f77317a2c1bb75e9414bf468fa57f03b -AUX ctrlaltdel 189 RMD160 8f6f4f30c13fb541e3a32221300889d2cedf3ec2 SHA1 3ed4732e0f6e5096be7805421400242854a9d476 SHA256 84eff8b4bd83ebded1689404f5da22a442e82e7f9d5d8df61a1a3032f80b503c -AUX finish.getty 30 RMD160 0bb0f0c1a05a78ce33bb4f95b84d142896e6471c SHA1 922f54e452cdf2af32b29db0349bee7c68811962 SHA256 6c5db3570b4abbc2547ee7923c18879912f197b52883abb08586f529cccd5aa5 -AUX run.getty 44 RMD160 4659766d2f0d3128a23bc0beac2dfe92f368d723 SHA1 6a7a78bc77448d2e5d1187be1214caab8cda31c2 SHA256 3b4105965417490496352da0fa36d7e79e8ff27989ce7d33023251654d6c119e -DIST runit-1.7.0.tar.gz 101315 RMD160 418db787290586a003481f938f4fa01934b9f063 SHA1 a49810a0c8c77dfec19f7282ac9c82b129554243 SHA256 f6bcd04bb300710ba4ade3b6c64298cb3e22090a8866455491ad086243453984 -DIST runit-2.0.0.tar.gz 104373 RMD160 fc55f22462b5b05d991558adf99468777789671a SHA1 a48d8579478fbcef37c347c3aa986f23fe528241 SHA256 2eb22e37946e479249a0b0e1fb0fb4651cebfd3d88aa116a39c07a0ec253fe28 -DIST runit-2.1.1.tar.gz 109661 RMD160 60f3d3b377bc9741ca96d2e953f86461368d6d29 SHA1 8eee39639dcb79ba251ca4ab2c7cde38059f09c2 SHA256 ffcf2d27b32f59ac14f2d4b0772a3eb80d9342685a2042b7fbbc472c07cf2a2c -EBUILD runit-1.7.0.ebuild 1678 RMD160 03b1f0a8d49e43fbd4531a28caff6228cf4451d3 SHA1 db1f696053ae00a0671a2e00be4f644130289cec SHA256 51424de6fc338ef7e46440d67092b358f8cce4740edc9bd1cbdc2cb87cd4f6d8 -EBUILD runit-2.0.0.ebuild 1689 RMD160 0ae9e15e688aace1380bb960322b8460afda88e5 SHA1 cfbf889d3b1023c760bf020b9666cab35923949c SHA256 27a12b0806ab9f12aea923f533ae3fdea13307553d33ea44f07029cd1811cb34 -EBUILD runit-2.1.1-r1.ebuild 1984 RMD160 b33cdccfa69b3e8673397bdc81adae7b64eb7e90 SHA1 7b83e81c4bbbb68768843c0d711cc2b0a5ddfcf1 SHA256 1c19ee2dc595948edd39c55922fb33b332d46a625ee325ab0e018aea0ad4c04c -EBUILD runit-2.1.1.ebuild 1631 RMD160 7362cc7d9228873b3d4277e164240a503157676f SHA1 3970b9e06c63a8aad79ec8b18a183007775c8467 SHA256 5b576091105dad929813ba018f9f5908f47e5c541f8787b01f79764b58940065 -MISC ChangeLog 4269 RMD160 90a64e15c65b19c9c76e4baacc6708dd11a1c8f9 SHA1 37d1e18c3d21304169d7ab79712d44ff9f793c10 SHA256 71dccb6ad8c309909c7ecd8f0cac1926659479783b5153e90789b3a7ef7df91c -MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 diff --git a/sys-process/runit/files/1 b/sys-process/runit/files/1 deleted file mode 100644 index d6a5b4f..0000000 --- a/sys-process/runit/files/1 +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# system one time tasks - -PATH=/sbin:/usr/sbin:/bin:/usr/bin - -RUNLEVEL=S /sbin/rc sysinit -RUNLEVEL=S /sbin/rc boot - -touch /etc/runit/stopit -chmod 0 /etc/runit/stopit diff --git a/sys-process/runit/files/2 b/sys-process/runit/files/2 deleted file mode 100644 index 233ad00..0000000 --- a/sys-process/runit/files/2 +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -PATH=/command:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin - -exec env - PATH=$PATH \ -runsvdir /var/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................' diff --git a/sys-process/runit/files/3 b/sys-process/runit/files/3 deleted file mode 100644 index 182151e..0000000 --- a/sys-process/runit/files/3 +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -exec >/dev/console 2>&1 -PATH=/sbin:/usr/sbin:/bin:/usr/bin - -echo 'Waiting for getties to stop...' -svwaitdown -xk -t10 /var/service/getty-* - -echo 'Waiting for services to stop...' -svwaitdown -xk -t300 /var/service/* - -echo 'Shutdown...' -test -x /etc/runit/reboot && LAST=6 || LAST=0 -test -x /etc/runit/reboot && RC=reboot || RC=shutdown -RUNLEVEL=$LAST /sbin/rc $RC - diff --git a/sys-process/runit/files/3-1.4 b/sys-process/runit/files/3-1.4 deleted file mode 100644 index f143f5f..0000000 --- a/sys-process/runit/files/3-1.4 +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -exec >/dev/console 2>&1 -PATH=/sbin:/usr/sbin:/bin:/usr/bin - -echo 'Waiting for getties to stop...' -sv shutdown -w 10 /var/service/getty-* - -echo 'Waiting for services to stop...' -sv shutdown -w 300 /var/service/* - -echo 'Shutdown...' -test -x /etc/runit/reboot && LAST=6 || LAST=0 -test -x /etc/runit/reboot && RC=reboot || RC=shutdown -RUNLEVEL=$LAST /sbin/rc $RC diff --git a/sys-process/runit/files/ctrlaltdel b/sys-process/runit/files/ctrlaltdel deleted file mode 100644 index 6684457..0000000 --- a/sys-process/runit/files/ctrlaltdel +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/bin -MSG="System is going down in 14 seconds..." - -# echo 'disabled.' ; exit -touch /etc/runit/stopit -chmod 100 /etc/runit/stopit && echo "$MSG" | wall -/bin/sleep 14 diff --git a/sys-process/runit/files/finish.getty b/sys-process/runit/files/finish.getty deleted file mode 100644 index c3d440a..0000000 --- a/sys-process/runit/files/finish.getty +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec utmpset -w TTY diff --git a/sys-process/runit/files/run.getty b/sys-process/runit/files/run.getty deleted file mode 100644 index ab6f954..0000000 --- a/sys-process/runit/files/run.getty +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /sbin/agetty 38400 TTY linux diff --git a/sys-process/runit/metadata.xml b/sys-process/runit/metadata.xml deleted file mode 100644 index 96a2d58..0000000 --- a/sys-process/runit/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>base-system</herd> -</pkgmetadata> diff --git a/sys-process/runit/runit-1.7.0.ebuild b/sys-process/runit/runit-1.7.0.ebuild deleted file mode 100644 index ed425b0..0000000 --- a/sys-process/runit/runit-1.7.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/runit-1.7.0.ebuild,v 1.9 2008/10/27 06:07:42 vapier Exp $ - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="A UNIX init scheme with service supervision" -HOMEPAGE="http://smarden.org/runit/" -SRC_URI="http://smarden.org/runit/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" -IUSE="static" - -DEPEND="" - -S=${WORKDIR}/admin/${P} - -src_unpack() { - unpack ${A} - cd "${S}" - - # we either build everything or nothing static - sed -i -e 's:-static: :' src/Makefile -} - -src_compile() { - cd src - use static && append-ldflags -static - - echo "$(tc-getCC) ${CFLAGS}" > conf-cc - echo "$(tc-getCC) ${LDFLAGS}" > conf-ld - - emake || die "make failed" -} - -src_install() { - dodir /var - keepdir /etc/runit{,/runsvdir{,/default,/all}} - dosym default /etc/runit/runsvdir/current - dosym ../etc/runit/runsvdir/current /var/service - - cd src - dobin $(<../package/commands) || die "dobin" - dodir /sbin - mv "${D}"/usr/bin/{runit-init,runit,utmpset} "${D}"/sbin/ || die "dosbin" - - cd "${S}" - dodoc package/{CHANGES,README,THANKS,TODO} - dohtml doc/*.html - doman man/*.[18] - - exeinto /etc/runit - doexe "${FILESDIR}"/{1,2,ctrlaltdel} || die - newexe "${FILESDIR}"/3-1.4 3 || die - for tty in tty1 tty2 tty3 tty4 tty5 tty6; do - exeinto /etc/runit/runsvdir/all/getty-$tty/ - for script in run finish; do - newexe "${FILESDIR}"/$script.getty $script - dosed "s:TTY:${tty}:g" /etc/runit/runsvdir/all/getty-$tty/$script - done - dosym ../all/getty-$tty /etc/runit/runsvdir/default/getty-$tty - done -} diff --git a/sys-process/runit/runit-2.0.0.ebuild b/sys-process/runit/runit-2.0.0.ebuild deleted file mode 100644 index 99b7d50..0000000 --- a/sys-process/runit/runit-2.0.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/runit-2.0.0.ebuild,v 1.1 2008/12/25 22:24:45 vapier Exp $ - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="A UNIX init scheme with service supervision" -HOMEPAGE="http://smarden.org/runit/" -SRC_URI="http://smarden.org/runit/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="static" - -DEPEND="" - -S=${WORKDIR}/admin/${P} - -src_unpack() { - unpack ${A} - cd "${S}" - - # we either build everything or nothing static - sed -i -e 's:-static: :' src/Makefile -} - -src_compile() { - cd src - use static && append-ldflags -static - - echo "$(tc-getCC) ${CFLAGS}" > conf-cc - echo "$(tc-getCC) ${LDFLAGS}" > conf-ld - - emake || die "make failed" -} - -src_install() { - dodir /var - keepdir /etc/runit{,/runsvdir{,/default,/all}} - dosym default /etc/runit/runsvdir/current - dosym ../etc/runit/runsvdir/current /var/service - - cd src - dobin $(<../package/commands) || die "dobin" - dodir /sbin - mv "${D}"/usr/bin/{runit-init,runit,utmpset} "${D}"/sbin/ || die "dosbin" - - cd "${S}" - dodoc package/{CHANGES,README,THANKS,TODO} - dohtml doc/*.html - doman man/*.[18] - - exeinto /etc/runit - doexe "${FILESDIR}"/{1,2,ctrlaltdel} || die - newexe "${FILESDIR}"/3-1.4 3 || die - for tty in tty1 tty2 tty3 tty4 tty5 tty6; do - exeinto /etc/runit/runsvdir/all/getty-$tty/ - for script in run finish; do - newexe "${FILESDIR}"/$script.getty $script - dosed "s:TTY:${tty}:g" /etc/runit/runsvdir/all/getty-$tty/$script - done - dosym ../all/getty-$tty /etc/runit/runsvdir/default/getty-$tty - done -} diff --git a/sys-process/runit/runit-2.1.1-r1.ebuild b/sys-process/runit/runit-2.1.1-r1.ebuild deleted file mode 100644 index 571646b..0000000 --- a/sys-process/runit/runit-2.1.1-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/runit-2.1.1-r1.ebuild,v 1.2 2012/02/06 03:13:33 vapier Exp $ - -EAPI="3" - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="A UNIX init scheme with service supervision" -HOMEPAGE="http://smarden.org/runit/" -SRC_URI="http://smarden.org/runit/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="static" - -S=${WORKDIR}/admin/${P}/src - -src_prepare() { - # we either build everything or nothing static - sed -i -e 's:-static: :' Makefile -} - -src_configure() { - use static && append-ldflags -static - - echo "$(tc-getCC) ${CFLAGS}" > conf-cc - echo "$(tc-getCC) ${LDFLAGS}" > conf-ld -} - -src_install() { - dodir /var - keepdir /etc/runit{,/runsvdir{,/default,/all}} - dosym default /etc/runit/runsvdir/current - dosym ../etc/runit/runsvdir/current /var/service - dosym ../etc/runit/2 /sbin/runsvdir-start - - dobin $(<../package/commands) || die "dobin" - dodir /sbin - mv "${ED}"/usr/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin" - - cd "${S}"/.. - dodoc package/{CHANGES,README,THANKS,TODO} - dohtml doc/*.html - doman man/*.[18] - - exeinto /etc/runit - doexe "${FILESDIR}"/{1,2,ctrlaltdel} || die - newexe "${FILESDIR}"/3-1.4 3 || die - for tty in tty1 tty2 tty3 tty4 tty5 tty6; do - exeinto /etc/runit/runsvdir/all/getty-$tty/ - for script in run finish; do - newexe "${FILESDIR}"/$script.getty $script - dosed "s:TTY:${tty}:g" /etc/runit/runsvdir/all/getty-$tty/$script - done - dosym ../all/getty-$tty /etc/runit/runsvdir/default/getty-$tty - done - - # make sv command work - cd "${S}" - insinto /etc/env.d - cat <<-EOF > env.d - #/etc/env.d/20runit - SVDIR="/var/service/" - EOF - newins env.d 20runit -} - -pkg_postinst() { - ewarn "/etc/profile was updated. Please run:" - ewarn "source /etc/profile" - ewarn "to make 'sv' work correctly on your currently open shells" -} diff --git a/sys-process/runit/runit-2.1.1.ebuild b/sys-process/runit/runit-2.1.1.ebuild deleted file mode 100644 index e3c6915..0000000 --- a/sys-process/runit/runit-2.1.1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/runit-2.1.1.ebuild,v 1.2 2011/06/15 18:55:12 flameeyes Exp $ - -EAPI="3" - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="A UNIX init scheme with service supervision" -HOMEPAGE="http://smarden.org/runit/" -SRC_URI="http://smarden.org/runit/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="static" - -S=${WORKDIR}/admin/${P}/src - -src_prepare() { - # we either build everything or nothing static - sed -i -e 's:-static: :' src/Makefile -} - -src_configure() { - use static && append-ldflags -static - - echo "$(tc-getCC) ${CFLAGS}" > conf-cc - echo "$(tc-getCC) ${LDFLAGS}" > conf-ld -} - -src_install() { - dodir /var - keepdir /etc/runit{,/runsvdir{,/default,/all}} - dosym default /etc/runit/runsvdir/current - dosym ../etc/runit/runsvdir/current /var/service - - dobin $(<../package/commands) || die "dobin" - dodir /sbin - mv "${D}"/usr/bin/{runit-init,runit,utmpset} "${D}"/sbin/ || die "dosbin" - - cd "${S}"/.. - dodoc package/{CHANGES,README,THANKS,TODO} - dohtml doc/*.html - doman man/*.[18] - - exeinto /etc/runit - doexe "${FILESDIR}"/{1,2,ctrlaltdel} || die - newexe "${FILESDIR}"/3-1.4 3 || die - for tty in tty1 tty2 tty3 tty4 tty5 tty6; do - exeinto /etc/runit/runsvdir/all/getty-$tty/ - for script in run finish; do - newexe "${FILESDIR}"/$script.getty $script - dosed "s:TTY:${tty}:g" /etc/runit/runsvdir/all/getty-$tty/$script - done - dosym ../all/getty-$tty /etc/runit/runsvdir/default/getty-$tty - done -} diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest deleted file mode 100644 index 7f044f2..0000000 --- a/x11-misc/virtualgl/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST VirtualGL-2.2.tar.gz 3289168 RMD160 3363dfae67d898de89df7d7022d6d16198ef5555 SHA1 1290054c75ede558c09b93f1cdebbe8037d07363 SHA256 3d689df579a3d0ceeb42b65aaff3e85e0e42873b427e58e0c389194bda408695 -EBUILD virtualgl-2.2.ebuild 1886 RMD160 67d206d17c683112ef619c70e5d0550658cfd098 SHA1 5e9b6010df9f4f23e72bf83a4f8fea2b94c11312 SHA256 c0d0e0e00addcdaa21aeadbbdc6aa2ec3814ca64ac5ed1dd4e5cb2c1d71becc3 -MISC virtualgl-2.2.ebuild.old 1790 RMD160 098732daf81d3209c5faa418d773d1f840d64b62 SHA1 059576c11fb6dba5fdb84ed9ae7f9298b1c04b35 SHA256 2db64d672deea99fa5ea4534b9538aa50ff31e9c4a860ca447e730131f0c1b07 -MISC virtualgl-2.2.ebuild~ 1830 RMD160 71f96ba42c0c5fd20fd5a6e2a1cf5f042ba63551 SHA1 86456432d0fe79bf43b1a563c10314a564b7399f SHA256 5020a410ae3e479667a53cc217b8ac62b5f64a90402af4a9f526dbecfa57816a diff --git a/x11-misc/virtualgl/virtualgl-2.2.ebuild b/x11-misc/virtualgl/virtualgl-2.2.ebuild deleted file mode 100644 index 5556c88..0000000 --- a/x11-misc/virtualgl/virtualgl-2.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -# x11-misc/virtualgl - -EAPI="2" - -inherit flag-o-matic - -DESCRIPTION="Run OpenGL applications on remote display software with full 3D hardware acceleration" -HOMEPAGE="http://www.virtualgl.org/" -SRC_URI="mirror://sourceforge/${PN}/VirtualGL/${PV}/VirtualGL-${PV}.tar.gz" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -SLOT="0" -LICENSE="LGPL-2.1 wxWinLL-3.1" -RESTRICT="mirror" - -IUSE="" -# IUSE="ssl" - -RDEPEND="media-libs/libjpeg-turbo[static-libs] - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXau - media-libs/mesa" -# ssl? ( dev-libs/openssl )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/vgl" - -src_prepare() { - # Change /usr/doc -> /usr/share/doc - sed -i -e 's:docdir=$(prefix):docdir=$(prefix)/share:' Makefile - - sed -ie 's,-L/usr,-L${EPREFIX}/usr,g' Makerules.linux - # Add zlib to ssl build (this should be conditional on dev-libs/openssl[+zlib]) -# has_version 'dev-libs/openssl[zlib]' || sed -i -e 's/-lcrypto -Wl,-Bdynamic/-lcrypto -Wl,-Bdynamic -lz/' Makerules.linux -} - -src_compile() { - # For some reason, it creates build-time symlinks to /usr/lib/gcc/ARCH/VERSION/{,32}/libstdc++.a - addpredict /usr/lib/gcc - append-ldflags -fpic,-Wall - append-flags -fpic -Wall - - emake LJTLIB=${EPREFIX}/usr/lib # $(use ssl && echo "USESSL=yes SSLINC=/usr/include/openssl SSLLIB=/usr/lib") - use amd64 && emake M32=yes LJTLIB=${EPREFIX}/usr/lib32 -} - -src_install() { - emake install $(use amd64 && echo LJTDIR=${EPREFIX}/usr || echo LJTLIB=${EPREFIX}/usr/lib) prefix="${ED}"/usr || die "installation failed" - dodoc BUILDING.txt - # /usr/bin/glxinfo conflicts with x11-misc/mesa-progs - # alternatively, we could rename this "vglxinfo" or something - rm "${D}/usr/bin/glxinfo" - - # (could set up vglusers group and/or run vglserver_config if reasonable defaults exist) -} diff --git a/x11-misc/virtualgl/virtualgl-2.2.ebuild.old b/x11-misc/virtualgl/virtualgl-2.2.ebuild.old deleted file mode 100644 index 0f54090..0000000 --- a/x11-misc/virtualgl/virtualgl-2.2.ebuild.old +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -# x11-misc/virtualgl - -EAPI="2" - -inherit flag-o-matic - -DESCRIPTION="Run OpenGL applications on remote display software with full 3D hardware acceleration" -HOMEPAGE="http://www.virtualgl.org/" -SRC_URI="mirror://sourceforge/${PN}/VirtualGL/${PV}/VirtualGL-${PV}.tar.gz" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -SLOT="0" -LICENSE="LGPL-2.1 wxWinLL-3.1" -RESTRICT="mirror" - -IUSE="" -# IUSE="ssl" - -RDEPEND="media-libs/libjpeg-turbo[static-libs] - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXau - media-libs/mesa" -# ssl? ( dev-libs/openssl )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/vgl" - -src_prepare() { - # Change /usr/doc -> /usr/share/doc - sed -i -e 's:docdir=$(prefix):docdir=$(prefix)/share:' Makefile - - # Add zlib to ssl build (this should be conditional on dev-libs/openssl[+zlib]) -# has_version 'dev-libs/openssl[zlib]' || sed -i -e 's/-lcrypto -Wl,-Bdynamic/-lcrypto -Wl,-Bdynamic -lz/' Makerules.linux -} - -src_compile() { - # For some reason, it creates build-time symlinks to /usr/lib/gcc/ARCH/VERSION/{,32}/libstdc++.a - addpredict /usr/lib/gcc - append-ldflags -fpic,-Wall - append-flags -fpic -Wall - - emake LJTLIB=/usr/lib # $(use ssl && echo "USESSL=yes SSLINC=/usr/include/openssl SSLLIB=/usr/lib") - use amd64 && emake M32=yes LJTLIB=/usr/lib32 -} - -src_install() { - emake install $(use amd64 && echo LJTDIR=/usr || echo LJTLIB=/usr/lib) prefix="${D}"/usr || die "installation failed" - dodoc BUILDING.txt - # /usr/bin/glxinfo conflicts with x11-misc/mesa-progs - # alternatively, we could rename this "vglxinfo" or something - rm "${D}/usr/bin/glxinfo" - - # (could set up vglusers group and/or run vglserver_config if reasonable defaults exist) -} diff --git a/x11-proto/inputproto/Manifest b/x11-proto/inputproto/Manifest deleted file mode 100644 index fe57f99..0000000 --- a/x11-proto/inputproto/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST inputproto-2.1.99.3.tar.bz2 175331 RMD160 c4dd440c63f4823982633f15ae6ea2ebff307377 SHA1 726d63755aa2d72fbf548cd583c8aff29aae529a SHA256 547690b27c059aefa7b4e9f0ffc980cedde62009acced925faf816a86ff03483 -EBUILD inputproto-2.1.99.3.ebuild 621 RMD160 b110e5e6e9a8689552a48457286d5712013f00ca SHA1 5dcd63bbbe590661cc85ff6c1e8792bedac030b9 SHA256 b496cafb5976e047dd74dd18cacf018e2aba04d72a71c40110c3fa03d6ee2382 -MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 diff --git a/x11-proto/inputproto/inputproto-2.1.99.3.ebuild b/x11-proto/inputproto/inputproto-2.1.99.3.ebuild deleted file mode 100644 index df2e17f..0000000 --- a/x11-proto/inputproto/inputproto-2.1.99.3.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/inputproto-2.0.2.ebuild,v 1.8 2011/08/20 15:55:01 jer Exp $ - -EAPI=4 -inherit xorg-2 - -DESCRIPTION="X.Org Input protocol headers" - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} -!<x11-libs/libXi-1.2.99" diff --git a/x11-proto/inputproto/metadata.xml b/x11-proto/inputproto/metadata.xml deleted file mode 100644 index 01c4c00..0000000 --- a/x11-proto/inputproto/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>x11</herd> -</pkgmetadata> |