summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2011-01-22 03:35:44 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2011-01-22 03:35:44 +0000
commit173f3563f7d1be67f2a87d07aa8683b7dfae6a08 (patch)
tree0e6bf6cff3ecc23388beb9fe929fc03ab92e476e /dev-lang
parentUpstream reports that a merging accident kept the fix out of the 1.8.2.1 tarb... (diff)
downloadhistorical-173f3563f7d1be67f2a87d07aa8683b7dfae6a08.tar.gz
historical-173f3563f7d1be67f2a87d07aa8683b7dfae6a08.tar.bz2
historical-173f3563f7d1be67f2a87d07aa8683b7dfae6a08.zip
Fixed for glibc-2.12. Added static-libs flag, moved to EAPI=2
Package-Manager: portage-2.1.9.34/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/cilk/ChangeLog7
-rw-r--r--dev-lang/cilk/Manifest12
-rw-r--r--dev-lang/cilk/cilk-5.4.6.ebuild16
3 files changed, 21 insertions, 14 deletions
diff --git a/dev-lang/cilk/ChangeLog b/dev-lang/cilk/ChangeLog
index af561428a1bd..417084055910 100644
--- a/dev-lang/cilk/ChangeLog
+++ b/dev-lang/cilk/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/cilk
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/cilk/ChangeLog,v 1.1 2008/10/27 14:41:53 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cilk/ChangeLog,v 1.2 2011/01/22 03:35:44 bicatali Exp $
+
+ 22 Jan 2011; SĂ©bastien Fabbro <bicatali@gentoo.org> cilk-5.4.6.ebuild:
+ Fixed for glibc-2.12. Added static-libs flag, moved to EAPI=2
*cilk-5.4.6 (27 Oct 2008)
diff --git a/dev-lang/cilk/Manifest b/dev-lang/cilk/Manifest
index 843a51663967..52245a0b3f1c 100644
--- a/dev-lang/cilk/Manifest
+++ b/dev-lang/cilk/Manifest
@@ -2,13 +2,13 @@
Hash: SHA1
DIST cilk-5.4.6.tar.gz 1270768 RMD160 3a1dc0397fe3e5514652cb6e441f2d0d0d91f73d SHA1 1e60512a3f8dad9aec3494599522e25a14b4d24b SHA256 0bee5386fabc87c97d716331b1b492eb8f18c8a8398c566afa3663f27139c9f6
-EBUILD cilk-5.4.6.ebuild 842 RMD160 de986ae1f8a4287ad0fa36dfdeec2c0ff6b5a840 SHA1 ab3c9e5f0c6a49980c9a11e7cd7132409ac07b1f SHA256 7cd2be59f3b1a5e6d24708881692d331e131b754251625e44aef63597eefb22d
-MISC ChangeLog 571 RMD160 ca411ddc6dc3daa6a3e75118f7f5ebf63949c588 SHA1 df0d126f4c48d510ba20da913ec5b3bb2ce83483 SHA256 6c9d1853de52816f0d9bb6e0c8bd65f78dbacbbf0b148dd437fd686286e28ce0
+EBUILD cilk-5.4.6.ebuild 923 RMD160 da519169998a7aaeb16cebfc10a23f92a4dca74a SHA1 6d8cc4a6b355e83825b2299e3d8cd702573accf5 SHA256 648a2fd8bf098626c309074da188e15f201b6ac4cf3139fb3f802037b1719766
+MISC ChangeLog 710 RMD160 7d6e17bc93350176c0520d9f3e054cc89f2d4fa3 SHA1 b3e037eeeb8a4784ba5a2e26176979f7151d1658 SHA256 b3485688a1c5788ffb5c8eadc3bb20f47920ea7321e3a7cf4d85a0f5d7fafccd
MISC metadata.xml 775 RMD160 88e634a544a797e84ddd5997e2f4b4b04ce8a15e SHA1 0f4cc2c0087488e6688e600e519a1305d8ddc4eb SHA256 b4a34bdea69c72682fb62eeb60c1f760599d843ffc49cf2087e69db7dc5375dd
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAkkF00kACgkQ1ycZbhPLE2Br9ACdHpx9ZfkQpwFoSyK0//eiBjU6
-uXAAoJOSv5U1+9DR88CTUqkYa3dqV5yM
-=2jir
+iEYEARECAAYFAk06UJgACgkQ1ycZbhPLE2C7jACggEwtQQoJIOP9pwdPWTkBGRml
+yNwAoKph7SRolE9sGDucWuRlwHGTUjIR
+=bWOI
-----END PGP SIGNATURE-----
diff --git a/dev-lang/cilk/cilk-5.4.6.ebuild b/dev-lang/cilk/cilk-5.4.6.ebuild
index 2e463f0da68f..641fa4031644 100644
--- a/dev-lang/cilk/cilk-5.4.6.ebuild
+++ b/dev-lang/cilk/cilk-5.4.6.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/cilk/cilk-5.4.6.ebuild,v 1.1 2008/10/27 14:41:53 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cilk/cilk-5.4.6.ebuild,v 1.2 2011/01/22 03:35:44 bicatali Exp $
+EAPI=2
inherit flag-o-matic
DESCRIPTION="Language for multithreaded parallel programming based on ANSI C."
@@ -11,14 +12,17 @@ SRC_URI="http://supertech.csail.mit.edu/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
+IUSE="doc examples static-libs"
-src_compile() {
+src_prepare() {
# cilk compiler doesn't like this flags...
filter-flags "-pipe"
filter-flags "-ggdb"
- econf
- emake || die "emake failed"
+ append-cppflags -D_XOPEN_SOURCE=500
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
}
src_install() {