From d73d6fa83d73fcb465d393b92fd191cb645e11b9 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Wed, 18 Feb 2015 21:33:27 +0000 Subject: [PATCH] Check the active gcc version (4.9 does not work), thanks everyone in bug #511640 Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xC74525F2 --- sys-devel/dragonegg/ChangeLog | 7 +++- sys-devel/dragonegg/Manifest | 15 +++---- sys-devel/dragonegg/dragonegg-3.5.0.ebuild | 48 ---------------------- sys-devel/dragonegg/dragonegg-3.5.1.ebuild | 12 +++++- sys-devel/dragonegg/dragonegg-9999.ebuild | 6 +-- 5 files changed, 25 insertions(+), 63 deletions(-) delete mode 100644 sys-devel/dragonegg/dragonegg-3.5.0.ebuild diff --git a/sys-devel/dragonegg/ChangeLog b/sys-devel/dragonegg/ChangeLog index 2e8888e552e1..66793608501e 100644 --- a/sys-devel/dragonegg/ChangeLog +++ b/sys-devel/dragonegg/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-devel/dragonegg # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/ChangeLog,v 1.21 2015/01/21 09:26:42 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/ChangeLog,v 1.22 2015/02/18 21:33:18 voyageur Exp $ + + 18 Feb 2015; Bernard Cafarelli -dragonegg-3.5.0.ebuild, + dragonegg-3.5.1.ebuild, dragonegg-9999.ebuild: + Check the active gcc version (4.9 does not work), thanks everyone in bug + #511640 *dragonegg-3.5.1 (21 Jan 2015) diff --git a/sys-devel/dragonegg/Manifest b/sys-devel/dragonegg/Manifest index 0d3d760ae9c8..e0382e773122 100644 --- a/sys-devel/dragonegg/Manifest +++ b/sys-devel/dragonegg/Manifest @@ -1,19 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST dragonegg-3.5.0.src.tar.xz 373932 SHA256 591133384cbdf329fa12975689e108e8b7c6272333749da6a6633a2b606234ec SHA512 10d8a59442c4469c34e3314de3a7dfba0afe6c7fbedb2a5d8550f2e0b91d3e040585b1467c18944a7cb08bbdd4250681f080f3d932c6ea9ae0e29e593f6527f6 WHIRLPOOL eabbc8fdd6f9aa8f027f95f71eaa3d55c676f3ae61ba38537ddb5e24319ae090f80db62e9e85957ee9225c39ffa5cb228e4184b6676dcd72857455d002158996 DIST dragonegg-3.5.1.src.tar.xz 374928 SHA256 65e7974a34406463cdfb8c0badd4dfe293ebe771a3d00c4d674d73c8007706e6 SHA512 546bef95aeea39e677b7e20a6d3085e3acac199dbebac12aa38b0991dc6420a07dd4e80466fd5a91285411095b33b0a23a4973dc911667fb4cc3461ef3af5a22 WHIRLPOOL f389644ad8829fb4be37ec1472ef6f5e2ee0f5a52e61395180ba97b70d624c5480463a77d1b4899a9472ec9771bb9789f1d5521e65edc2a9e3ff4eba4fb41b99 -DIST llvm-3.5.0.src.tar.xz 11735940 SHA256 28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03 SHA512 b4d0f325dbdb0a8f10e5fd031954ef4b1971d8f99f4e4b53834801a2b74a7acde3f77c655c8355b407424b363edfb10f71d85fc370356dc52af5c636a1bba197 WHIRLPOOL 561520823468b61c63df8e13f876b7ac586eb1e52c256e9a36370e5d46e8cef3937655c36fbb51eebd3680fab67412e7c777479477fc728e7a8f35420e573ef1 DIST llvm-3.5.1.src.tar.xz 11869356 SHA256 bf3275d2d7890015c8d8f5e6f4f882f8cf3bf51967297ebe74111d6d8b53be15 SHA512 a643ff173627e813b26077829b1af801b75daa5dcea540c4f05366ed57ef6aeafaf8b3fe4208d4c1b303a048a90ddac48a23488480c165637ae9218de140ae55 WHIRLPOOL 798ad46bc21570d8e5b0caadf2c0b434382fd78bfea5a08097fa001019b749b828e56ffe330435e5f3556700e8b0bee29e4139a7ff6b2824bb83dcc8caba2606 -EBUILD dragonegg-3.5.0.ebuild 1346 SHA256 0de93fedb9af7a55379601f0d6473beddfcdc331d5b30ca567e223571b2ecd51 SHA512 05b81644969223c69f195c4d36a42dc10c0e612ad0ae1ea63212782fbcdb35d07ec97601a56fd3e2baf540be44b07bd0267694ec4385866ed2b54429a47c9cfe WHIRLPOOL c37b8bea123c98f7629ef73c1ea7b0c79811a9bb7a9479e369efcdc5b80a2f51dc944cd6e6c45fb86d9c17923758bb586bcb721aeeefafd45b878551a749ad0b -EBUILD dragonegg-3.5.1.ebuild 1346 SHA256 6c0e7c51ac9b22cf7b3da4a157c96d1a66fd1c64d6cefab2827ccb1140104596 SHA512 01c8ef1ccb7a4d12c40c67244b7cfc816568a26f6eb2e9e1cbc7b1f252f735f5a952ae7d87458d8153db710f20cf1e06a8aa3908874ce7f70f15f1c444743c99 WHIRLPOOL 1639933ed0102bca759c4b58c003f6d23bcd91b1d931f41a25bcac8a1cd7e662ca16c0040bd80d3529996fe2debaadbd3b6e52500df4faad1c0c69ad4326ad0b -EBUILD dragonegg-9999.ebuild 1444 SHA256 1292f7a40858cf03807c2b48506554e2e55272c350f265798afd08221297af06 SHA512 a226d9a76f3294856e8535380fa74fbb518b12bea79e4d7f3bfb4af48a196e0ed47bd7002046e2eb8cf1b56c62c826a419fbab2ecbb4d7050ee0ef3f6ed779c7 WHIRLPOOL 7647d408f455ef43f7b038b9fc8a1e201ec22d0dc043de3c4f08a6d8dcd5e36411e9bd326a3f41344ddad2d7c3004130d170bd3b42d4247b260d8e3c71332ab0 -MISC ChangeLog 3864 SHA256 e07276870cd2bdc0637817a138c6fc20779ea29da0a99884b209607a947f60c3 SHA512 8151b3583abe57982d354450ce2b90eee1d27213e69ad39fda0c378c77df8b8c6521182c5a57c12814f391f92aa8371cb2be07738c135d6a167721d40bf4b99a WHIRLPOOL a185edd7b142166cee809174c01108e2002f337104880f55b3225d0614289e6800a3bd60f3903e91542baefa63f1f7c5b53b5af53ee5c4c69011f2134fa90434 +EBUILD dragonegg-3.5.1.ebuild 1573 SHA256 975a75c40c5f34ddaa431f77a4a3df5fcece4569a469ad97fb6b93f188560656 SHA512 ecda87b83e2c0381fbc096a2d1b7e098bf058246156356e4ee859cd09616f794255184a3c10e94f64dd38463b57fa1cc9689fb69405c4136a22eaec22164b3e1 WHIRLPOOL 6759a8d74deffce7b1b2fdd4b203338b9bfbdcd79bc9b75779b3d5ebaad81bdd1a4a2fb3aa3456aa94128637e4fd58f0890e49cca4999b541855060f662ad883 +EBUILD dragonegg-9999.ebuild 1446 SHA256 64faa3c45db7174f58cfe406561bc5295e2f0ad55b97efc299545d2875ba2f0e SHA512 8fc696e8a3b606dd8f2caea05c6ea280495029e9ac393a8ce2de9be677ca432ec995e3c0d26b85d8c9a24cfc1459acdcc4b2a741174c3a91533843e36f268825 WHIRLPOOL a1b0b725ea0702b80009d600393bf71df3c7fe77b1e03b9b337baf1fdd87ed1fe2edefc26579f3e8f58be9dcc4487e92798f57aa1b70aa9eecf58508b4213107 +MISC ChangeLog 4079 SHA256 ec79854fdff2f5602c2ef90041c6d57adec72580da8871ec54ff338354a35d76 SHA512 42bb8f173421bf5d4c05250a5f1be24917a00e17b1688aa230bd6e7a7e0a7cdeff4493853e51d253fb9b16ced51d8eb31c49915415e085870f02f891e5edd9ab WHIRLPOOL 60016335a6ab03f6e7ab7f119060af583fb9d9461b82227ae1c72135615907878991c502c65ccf84f8cb87d04122a3929d23cea617a23d7aef60716b81039e72 MISC metadata.xml 492 SHA256 30b11ba6c1fb003706253651ad24ef789018d994e3e1d452e6639133a5a0b6f2 SHA512 6bf3c7b000bb563c104894cea43dad7f603155af8ffdfa2f90deac59c300429f28f34675f4c30e927626dd7cf037951cca497d48ddcf5da1e3f7bd07acbe14de WHIRLPOOL 8ead3c6d688f4037bce4901e464d19c425f9357658de2527113172dcc771806b0c52c2a0485e62f05c341b5c15c345b30122ca5decee233b3cf9807ff0158fda -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlS/cNMACgkQFYEBGcdFJfIJEQD+OW92rmIC0QPYp+huYtv1v2hV -xIIaZCJjn9UjJ+NenlkA/1ki0QgVjPny8QSKcl3N89ty/ovbLADA5RW9MrU4zglW -=VNtz +iF4EAREIAAYFAlTlBSQACgkQFYEBGcdFJfJLXQEAhLpp8WHGz2HitSpnmHwSt3QV +gWg+dtXj75HO7w3HHZsA/AsxEPBt9EJC0YoHGsAKRQWEq38bTHJOlqNh/v67VNPk +=jPan -----END PGP SIGNATURE----- diff --git a/sys-devel/dragonegg/dragonegg-3.5.0.ebuild b/sys-devel/dragonegg/dragonegg-3.5.0.ebuild deleted file mode 100644 index 8bed3ff9669f..000000000000 --- a/sys-devel/dragonegg/dragonegg-3.5.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-3.5.0.ebuild,v 1.1 2014/09/17 23:13:12 voyageur Exp $ - -EAPI=5 -inherit eutils multilib toolchain-funcs - -DESCRIPTION="GCC plugin that uses LLVM for optimization and code generation" -HOMEPAGE="http://dragonegg.llvm.org/" -SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz - test? ( http://llvm.org/releases/${PV}/llvm-${PV}.src.tar.xz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux" -IUSE="test" - -DEPEND=">=sys-devel/gcc-4.5 - =sys-devel/llvm-${PV}*" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${P}.src - -src_compile() { - # GCC: compiler to use plugin with - emake CC="$(tc-getCC)" GCC="$(tc-getCC)" CXX="$(tc-getCXX)" VERBOSE=1 -} - -src_test() { - # GCC languages are determined via locale-dependant gcc -v output - export LC_ALL=C - - emake LIT_DIR="${WORKDIR}"/llvm-${PV}.src/utils/lit check -} - -src_install() { - exeinto /usr/$(get_libdir) - doexe dragonegg.so - - dodoc README -} - -pkg_postinst() { - elog "To use dragonegg, run gcc as usual, with an extra command line argument:" - elog " -fplugin=/usr/$(get_libdir)/dragonegg.so" - elog "If you change the active gcc profile, or update gcc to a new version," - elog "you will have to remerge this package to update the plugin" -} diff --git a/sys-devel/dragonegg/dragonegg-3.5.1.ebuild b/sys-devel/dragonegg/dragonegg-3.5.1.ebuild index 98ae5a6cde88..15f6746eaf6d 100644 --- a/sys-devel/dragonegg/dragonegg-3.5.1.ebuild +++ b/sys-devel/dragonegg/dragonegg-3.5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-3.5.1.ebuild,v 1.1 2015/01/21 09:26:42 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-3.5.1.ebuild,v 1.2 2015/02/18 21:33:18 voyageur Exp $ EAPI=5 inherit eutils multilib toolchain-funcs @@ -15,12 +15,20 @@ SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux" IUSE="test" -DEPEND=">=sys-devel/gcc-4.5 +DEPEND=">=sys-devel/gcc-4.5:* =sys-devel/llvm-${PV}*" RDEPEND="${DEPEND}" S=${WORKDIR}/${P}.src +pkg_pretend() { + # Bug #511640: gcc 4.9 removed a required header + if [[ ${MERGE_TYPE} != binary ]]; then + [[ $(gcc-version) > 4.8 || $(gcc-version) < 4.5 ]] && \ + die 'The active compiler needs to be gcc 4.[5-8])' + fi +} + src_compile() { # GCC: compiler to use plugin with emake CC="$(tc-getCC)" GCC="$(tc-getCC)" CXX="$(tc-getCXX)" VERBOSE=1 diff --git a/sys-devel/dragonegg/dragonegg-9999.ebuild b/sys-devel/dragonegg/dragonegg-9999.ebuild index ac428252b1c9..59f6df981a03 100644 --- a/sys-devel/dragonegg/dragonegg-9999.ebuild +++ b/sys-devel/dragonegg/dragonegg-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-9999.ebuild,v 1.7 2014/09/17 23:13:12 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-9999.ebuild,v 1.8 2015/02/18 21:33:18 voyageur Exp $ EAPI=5 inherit git-r3 multilib toolchain-funcs @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="" IUSE="" -DEPEND=">=sys-devel/gcc-4.5 +DEPEND=">=sys-devel/gcc-4.5:* ~sys-devel/llvm-${PV}" RDEPEND="${DEPEND}" -- 2.26.2