diff options
author | Richard Yao <ryao@gentoo.org> | 2012-06-11 00:29:04 +0000 |
---|---|---|
committer | Richard Yao <ryao@gentoo.org> | 2012-06-11 00:29:04 +0000 |
commit | 7dc5c9f2e8796e4ad2c51cf1dd498f32a58309fe (patch) | |
tree | 562a2996137513aa903c4ac2548b40815ec0419d /dev-libs/pcc-libs | |
parent | fix compilation of USE="static-libs zip" wrt bug #420293 (diff) | |
download | gentoo-2-7dc5c9f2e8796e4ad2c51cf1dd498f32a58309fe.tar.gz gentoo-2-7dc5c9f2e8796e4ad2c51cf1dd498f32a58309fe.tar.bz2 gentoo-2-7dc5c9f2e8796e4ad2c51cf1dd498f32a58309fe.zip |
keyword ~amd64-fbsd, fix clang build failure (bug #420609)
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/pcc-libs')
-rw-r--r-- | dev-libs/pcc-libs/ChangeLog | 8 | ||||
-rw-r--r-- | dev-libs/pcc-libs/files/pcc-libs-1.0.0-check-builtin.patch | 62 | ||||
-rw-r--r-- | dev-libs/pcc-libs/pcc-libs-1.0.0.ebuild | 11 |
3 files changed, 76 insertions, 5 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/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" |