keyword ~amd64-fbsd, fix clang build failure (bug #420609)

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 79 insertions, 19 deletions

diff --git a/dev-libs/pcc-libs/ChangeLog b/dev-libs/pcc-libs/ChangeLog
index 84c21c3c201f..c09f7ce1cdee 100644
--- a/dev-libs/pcc-libs/ChangeLog
+++ b/dev-libs/pcc-libs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/pcc-libs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pcc-libs/ChangeLog,v 1.6 2011/04/04 10:20:48 patrick Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pcc-libs/ChangeLog,v 1.7 2012/06/11 00:29:04 ryao Exp $
+
+  11 Jun 2012; Richard Yao <ryao@gentoo.org>
+  +files/pcc-libs-1.0.0-check-builtin.patch, pcc-libs-1.0.0.ebuild:
+  keyword ~amd64-fbsd, fix clang build failure (bug #420609)
 
 *pcc-libs-1.0.0 (04 Apr 2011)
 
diff --git a/dev-libs/pcc-libs/Manifest b/dev-libs/pcc-libs/Manifest
index c0a0649a5316..2a3e7bb35c8b 100644
--- a/dev-libs/pcc-libs/Manifest
+++ b/dev-libs/pcc-libs/Manifest
@@ -1,24 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX pcc-libs-1.0.0-check-builtin.patch 1213 RMD160 7c515fd75d350f257f0ec3b7cf1486449979f914 SHA1 068fedafa4326f93891fa527647007a8c83b9784 SHA256 61b3d8a608dfdca8902c2c8a86add11146257f7504b967e0033582c8a2dc37c1
 DIST pcc-libs-1.0.0.tgz 190238 RMD160 29bf80337fa132ea0200c914d2512f67bdaf4945 SHA1 83dfe7029c491d4b42205bc8882c1ac784e3e4eb SHA256 f89ac94e30927a28c78fc8b8b7fef617eeaf843e2268063d43e414cf3179dd62
 DIST pcc-libs-100604.tbz2 148394 RMD160 c233dbba6215b9b0d85a90e0247cd9195286dc0d SHA1 82ad2e10a828f70cf0d16c2c8118fffd5e60fb3d SHA256 72ca919aa272791628b38ac7c69dd14b8d3042bd64e1e8ab2338d204b4e4d3d6
 DIST pcc-libs-100830.tgz 188569 RMD160 8e844e1b16db56fe96a4c49c23be10b1b0a2653a SHA1 4c20fef0f3ca5c340e66a2aa6eb69450f569ea92 SHA256 c08a05bdd698bb5593c313a8a8a8a353722d2a7767474c9b743d6a98f4d1412b
 DIST pcc-libs-101124.tgz 188690 RMD160 8a42408c493e3596672c89129e6fbd95a566ef9c SHA1 046b4f7ea9d258b32f2efd1bb21116870ab1b75c SHA256 5ac71f403abc316c5163229bfce5b77d6023e7b2c139b67a21b40a89d805c467
 DIST pcc-libs-20110116.tgz 188713 RMD160 a10801624b06be65a211bb704152aca597a279d6 SHA1 096e6cf652946754ee2014f2dfc87ebe640b6d51 SHA256 5d787c4ba1a39f0c3c3dd0756e9262a313e7d958be0b3321e3564df91c22da96
-EBUILD pcc-libs-1.0.0.ebuild 633 RMD160 e353ae357e67f6cd6327bed563cf1286c001001b SHA1 d9f43061dec42c39a1013e15ec4fb1cec407d330 SHA256 9deb6581d67fc992fdea34766a0057ddb76a5e6418ba3d29d3bab8b7ae10a6df
+EBUILD pcc-libs-1.0.0.ebuild 707 RMD160 db831af9139af951ea65b572f1e6e114ec428b54 SHA1 02b9d6ed9df8bb88e051d31e4e6459b84d2ffd33 SHA256 d94852c48bbe8ea7c5908b18a7376e120e1dab556d512024de0b3fa45d18924a
 EBUILD pcc-libs-1.0.0_pre100604.ebuild 762 RMD160 4a7318b6ce953f89f11dca1578b70b537f735378 SHA1 69ae01ef9149d20989b0fdbc733c69315d00eb6f SHA256 86a1da32242e8ed76b656a369eedb565394f6de23c8925f95ad2c7696d96ef2d
 EBUILD pcc-libs-1.0.0_pre100830.ebuild 760 RMD160 2d57982ac588515d8e55cff0136d7119aa4adb61 SHA1 3fbc7c19bcae02808892503eb53904dd1de84f6e SHA256 d5a5da4c81169df966a9dadf9aaa7ab3000dfd7f971a21f8b376c8563c8ebf1b
 EBUILD pcc-libs-1.0.0_pre101124.ebuild 760 RMD160 07abc21f43220858d20832afa2e9cfc60389e45d SHA1 49eb3604870ce80b93ba24f49d2587541bf87459 SHA256 9f94a4a02b2b293038be4dffe32b1f5f25271897923c58949b3e4b4e4cceb9c9
 EBUILD pcc-libs-1.0.0_pre20110116.ebuild 762 RMD160 5c72933bc175c12935792ce14242dba92a5eb27b SHA1 cfce1ad948534c0988dee011e4888b5c661fce60 SHA256 8b715b689361522ffab80a6a45f73763612b669138d7d2f0341046b4be529f0a
-MISC ChangeLog 1044 RMD160 25eb8a14a64f3f2e4ba358e03f6619846af94e65 SHA1 039e069542e597a33485ce83ee21c252c9b28e8c SHA256 a95af0886ce10c4bf1ad2a0e3214034ee1e3c4c55dcb88c777c9d80c04994414
+MISC ChangeLog 1216 RMD160 a9c7fac4a709529d2e582636f1fb32a45c1feed8 SHA1 7a3cb1de18588274875439090a99f1b96c0f8aaf SHA256 0dc34b44d930411fb5d48b7c942dbd5d74a8f4a2abbd6d179cb552eabc3640c3
 MISC metadata.xml 233 RMD160 50382a495f6d0286f96498c8a5e9b919c7e1d8d4 SHA1 5178d90b05252ea896110ef08ca4ee693b6ad9eb SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59C7MACgkQfXuS5UK5QB1BIAQAjqGjXn84pG7EX+ED8fbiMIrh
-+UMz9jIb+EN3RfT4V7t9Ua/5F3CkB/YBoZxpRWTckbk6Md7uHrxz2r9IZiLTagT6
-YkyzqO9jp4blFD08y160gNiG4CO1uC+ImXnXSTIJENO3j6Ln56HpUln+lnSS7rYg
-7xlYEi54MZpyNMcggZM=
-=8b2C
------END PGP SIGNATURE-----
diff --git a/dev-libs/pcc-libs/files/pcc-libs-1.0.0-check-builtin.patch b/dev-libs/pcc-libs/files/pcc-libs-1.0.0-check-builtin.patch
new file mode 100644
index 000000000000..335f2d774b8c
--- /dev/null
+++ b/dev-libs/pcc-libs/files/pcc-libs-1.0.0-check-builtin.patch
@@ -0,0 +1,62 @@
+diff --git a/libpcc/bitcnt.c b/libpcc/bitcnt.c
+index 26ecc01..c3bd54e 100644
+--- a/libpcc/bitcnt.c
++++ b/libpcc/bitcnt.c
+@@ -1,9 +1,22 @@
++// Only use __has_builtin in compilers that support it.
++#ifndef __has_builtin
++	#define __has_builtin(x) 0
++#endif
+ 
++#if !__has_builtin(__builtin_clz)
+ int __builtin_clz(unsigned int);
++#endif
++#if !__has_builtin(__builtin_ctz)
+ int __builtin_ctz(unsigned int);
++#endif
++#if !__has_builtin(__builtin_clzl)
+ int __builtin_clzl(unsigned long);
++#endif
++#if !__has_builtin(__builtin_ctzl)
+ int __builtin_ctzl(unsigned long);
++#endif
+ 
++#if !__has_builtin(__builtin_clz)
+ int
+ __builtin_clz(unsigned int v)
+ {
+@@ -14,7 +27,9 @@ __builtin_clz(unsigned int v)
+ 			break;
+ 	return i;
+ }
++#endif
+ 
++#if !__has_builtin(__builtin_ctz)
+ int
+ __builtin_ctz(unsigned int v)
+ {
+@@ -25,7 +40,9 @@ __builtin_ctz(unsigned int v)
+ 			break;
+ 	return i;
+ }
++#endif
+ 
++#if !__has_builtin(__builtin_clzl)
+ int
+ __builtin_clzl(unsigned long v)
+ {
+@@ -37,7 +54,9 @@ __builtin_clzl(unsigned long v)
+ 			break;
+ 	return i;
+ }
++#endif
+ 
++#if !__has_builtin(__builtin_ctzl)
+ int
+ __builtin_ctzl(unsigned long v)
+ {
+@@ -48,3 +67,4 @@ __builtin_ctzl(unsigned long v)
+ 			break;
+ 	return i;
+ }
++#endif
diff --git a/dev-libs/pcc-libs/pcc-libs-1.0.0.ebuild b/dev-libs/pcc-libs/pcc-libs-1.0.0.ebuild
index accb04b4c284..696af594ceae 100644
--- a/dev-libs/pcc-libs/pcc-libs-1.0.0.ebuild
+++ b/dev-libs/pcc-libs/pcc-libs-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pcc-libs/pcc-libs-1.0.0.ebuild,v 1.1 2011/04/04 10:20:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pcc-libs/pcc-libs-1.0.0.ebuild,v 1.2 2012/06/11 00:29:04 ryao Exp $
 
 EAPI=2
 
@@ -12,12 +12,17 @@ HOMEPAGE="http://pcc.ludd.ltu.se"
 SRC_URI="ftp://pcc.ludd.ltu.se/pub/pcc-releases/${P}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~amd64-fbsd"
 
 IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}"
 
+src_prepare()
+{
+	epatch "${FILESIR}/${P}-check-builtin.patch"
+}
+
 src_compile() {
 	# not parallel-safe yet
 	emake -j1 || die "emake failed"