summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-07-26 00:44:12 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-07-26 00:44:12 +0000
commita46b98859dbda484b0a59ef46a253b3623e70211 (patch)
tree3df4e98ee3b4e1ac4bbbdd925eb4c619597e79c6 /sys-libs
parentWarn if building on top of libsupc++ since it is not well supported. (diff)
downloadhistorical-a46b98859dbda484b0a59ef46a253b3623e70211.tar.gz
historical-a46b98859dbda484b0a59ef46a253b3623e70211.tar.bz2
historical-a46b98859dbda484b0a59ef46a253b3623e70211.zip
Die if someone tries to build it with <gcc-4.7. Based on a patch by Yuta SATOH in bug #475294
Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64 Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/libcxx/ChangeLog6
-rw-r--r--sys-libs/libcxx/Manifest10
-rw-r--r--sys-libs/libcxx/libcxx-9999.ebuild7
3 files changed, 16 insertions, 7 deletions
diff --git a/sys-libs/libcxx/ChangeLog b/sys-libs/libcxx/ChangeLog
index 3558ae891426..fd14c2b14198 100644
--- a/sys-libs/libcxx/ChangeLog
+++ b/sys-libs/libcxx/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/libcxx
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.30 2013/07/26 00:37:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.31 2013/07/26 00:44:05 aballier Exp $
+
+ 26 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
+ Die if someone tries to build it with <gcc-4.7. Based on a patch by Yuta
+ SATOH in bug #475294
26 Jul 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
Warn if building on top of libsupc++ since it is not well supported.
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 6c226a02dd0a..31bc80567144 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -10,13 +10,13 @@ DIST libcxx-0.0_p20130531.tar.xz 804716 SHA256 41c3d40d37378f4d3f065f884df6b3e0c
EBUILD libcxx-0.0_p20130218.ebuild 1762 SHA256 73ec38dcc52bb2e35172dcb99ae667a976ade6a672b6c6e0e3e503460866b3ae SHA512 57abd59e833f5594b19505363e492efaef70872d0e8e31d8fca1667380f21fe67d266b6b7dab1a6b3aeb906039d93e51081da85b0c43e1f4e1c4f65b3d4d75f7 WHIRLPOOL 94de3f70ba4083e95b85a81d3518c5d0af5655547f389cc87ed917e424b22e671850191efaf3bafc997b8d24c569ec6b39b6d72886c9e75c570d86e451264de8
EBUILD libcxx-0.0_p20130531-r1.ebuild 4125 SHA256 bf5a4d84369351c86aaf51d9ba4f530eac8427106db936456fbb0517c9ae7372 SHA512 f6e7c455280a3bf30fc9378299b10dbcde89f7d85850c7644632be9052d3e3bfac167f47a2a1c67e647783152b3d68c3d30f8aface2a1eaa5e330f17d9a56a7f WHIRLPOOL bda77f7a7365f887257d3f6e09f537b469baddbdd77a03763d49da750f0ec43450d2bc4aff4f39b80188a26ac587710db604c346d78967ca591674714598d7e5
EBUILD libcxx-0.0_p20130531.ebuild 2872 SHA256 46ec7affff2212776a32ee9c4879016f8b07cf942f55f45e374c5594ae48d5e4 SHA512 63808230eff4b71bec89e003c89987da83429bdaf5975b257860ed0a48dc0a6b7c9de409e5783a0c87d2b67b9e112cc9d90e74cba46629fbb35960b5e98234db WHIRLPOOL b9497c69346d2e3f4220bdb545373f2a9012bc6e7da8c23a97e4ac8fb54d482c0e0d7d898c53e0e10fdb907d7a44552d1f5fd166c02c7111044ceced747edad2
-EBUILD libcxx-9999.ebuild 5148 SHA256 4305095caa41da22c29abea2755c5e2144bfddca3d8380c4bf735314c111806d SHA512 5d5c21d6bba7b1aa97b7d4288196184cbb28f9538f0125755d2dbd147dd5de1e0587b195a52b7c6254b79a3daaed85e19414aae67125cd15ef389ae8a50222d0 WHIRLPOOL 060ce5bbeb51ecd868228bfb34a80318f479304617b6f40af2c1b13329393d86186d622c734f25e5cf3c9d25bd841c691cfc27c2aafecf68cfc7ffc1c596a174
-MISC ChangeLog 4779 SHA256 ca43162c705ba9ac17ce2384b85d1c31b55c0709e11883d41a99451215946ea9 SHA512 76c007452b32b731a65f52edcb46be49e1d1b7b0302b249b65c9f014c0b70ab42d8d63431b7fa869d0d1242fe2538e6748ee5737bfc95bcc3e6da6ced8a62cb3 WHIRLPOOL ac78e88ca7b91038552a79c75c2e9ef9c183f5d5163cd8917468bee69736423821defb38a4b878ede2fae47f8c07b8265ada98fdf12da19c2152f722873f120c
+EBUILD libcxx-9999.ebuild 5372 SHA256 26f8428f4812e0348b70831f529a6ddde804cfe6190fc66ba44a2ae5d9044fda SHA512 c9f765d266807cd6ba62f2dc54f8f763d841ee624694fdba626bb2352ae0431b5fdc14fab5c2408da013b4f8a5bea94c4708ae7b5df8524b87ee81be048112d0 WHIRLPOOL 5341fcd73f3904cfbff70200fb5564f222b09c88ab4f0dd9f6170a9a13b58c0057abe0609b3cd9c055d1da9cb3669e511225f8d03b624c54200e46807a8278a2
+MISC ChangeLog 4950 SHA256 f33c4adb75043eafac067e67a4ec1839f7ceeec544d5887dfd9d31b74e48eac9 SHA512 82d924479b27e3941e68c10bb94b9efd6d268010b934150e48646d6ce38357430ef7c5cfc6666d8afda182ce32ca3025cd243a0acf6a245ccbd1757b9f9d7b61 WHIRLPOOL 8f73cc9d1126e2f3bcb6cfb6a4d6528f78af270112933ed48b2213312f72bff120da560151784d6ba3148ba293b678fba6617ba385cfb2a5b73cd7be5c42fd82
MISC metadata.xml 558 SHA256 c9fe7077a8c7f767d7cdbe154d85dd344fb86ea246b16613242c70a40f3e1ef2 SHA512 3f324c4959a7c9f2613b29928957fd010b35c6e9c1601f0296e7e8b7c8d59a3c27c5c04fef87ac825f2f7bb07553bc617c4405e1e22847dc8db3e7a1ebb21f50 WHIRLPOOL 3ade5e3852afcd533c89ce0aeead55101f23d1b31825718bfccd60fac485961df617c93962be4c60333a21335dcd6bb5630c8002fe06f456c4e177c14d434455
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iEYEAREIAAYFAlHxxMMACgkQvFcC4BYPU0pf8QCgykzoYIJT59TiOW5QqlYaEZHW
-qtQAoKuMGVSuEkTAeLMrgHqEzuylwgUo
-=EW58
+iEYEAREIAAYFAlHxxlYACgkQvFcC4BYPU0rQagCeO+TzHCX7eLDSAZDeJ7mDnBf9
+cekAmQHA5mg3zDJTPOM30qoU1O19uXwW
+=bC0w
-----END PGP SIGNATURE-----
diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild
index 38c5fc4bf1ea..c5b1587a8e19 100644
--- a/sys-libs/libcxx/libcxx-9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.22 2013/07/26 00:37:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.23 2013/07/26 00:44:05 aballier Exp $
EAPI=5
@@ -41,6 +41,11 @@ pkg_setup() {
ewarn "libsupc++. Please note that this is not well supported."
ewarn "In particular, static linking will not work."
fi
+ if [[ $(gcc-version) < 4.7 ]] && [[ $(tc-getCXX) != *clang++* ]] ; then
+ eerror "${PN} needs to be built with clang++ or gcc-4.7 or later."
+ eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+ die
+ fi
}
src_prepare() {