summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2013-01-14 04:41:43 +0000
committerChristoph Junghans <ottxor@gentoo.org>2013-01-14 04:41:43 +0000
commit0eb908a26019221eda3ad3603348d091f2bf387c (patch)
tree61d572d75f8243eb7e98fff3cd0b47c35c4b8224 /dev-lang/libcilkrts
parentApplied reworked upstream patch by Matěj Laitl to fix a crash on startup rel... (diff)
downloadhistorical-0eb908a26019221eda3ad3603348d091f2bf387c.tar.gz
historical-0eb908a26019221eda3ad3603348d091f2bf387c.tar.bz2
historical-0eb908a26019221eda3ad3603348d091f2bf387c.zip
version bump
Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64 Manifest-Sign-Key: 0xC2000586
Diffstat (limited to 'dev-lang/libcilkrts')
-rw-r--r--dev-lang/libcilkrts/ChangeLog11
-rw-r--r--dev-lang/libcilkrts/Manifest22
-rw-r--r--dev-lang/libcilkrts/files/libcilkrts-2546-build.patch11
-rw-r--r--dev-lang/libcilkrts/files/libcilkrts-2856-flags.patch18
-rw-r--r--dev-lang/libcilkrts/libcilkrts-2856.ebuild (renamed from dev-lang/libcilkrts/libcilkrts-2546.ebuild)14
5 files changed, 45 insertions, 31 deletions
diff --git a/dev-lang/libcilkrts/ChangeLog b/dev-lang/libcilkrts/ChangeLog
index 7a6284fce503..7cabefe69d45 100644
--- a/dev-lang/libcilkrts/ChangeLog
+++ b/dev-lang/libcilkrts/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-lang/libcilkrts
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/libcilkrts/ChangeLog,v 1.2 2012/07/18 02:23:48 ottxor Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/libcilkrts/ChangeLog,v 1.3 2013/01/14 04:41:37 ottxor Exp $
+
+*libcilkrts-2856 (14 Jan 2013)
+
+ 14 Jan 2013; Christoph Junghans <ottxor@gentoo.org>
+ +files/libcilkrts-2856-flags.patch, +libcilkrts-2856.ebuild,
+ -files/libcilkrts-2546-build.patch, -libcilkrts-2546.ebuild:
+ version bump
*libcilkrts-2546 (18 Jul 2012)
diff --git a/dev-lang/libcilkrts/Manifest b/dev-lang/libcilkrts/Manifest
index 3e389499b660..9565b41dd5db 100644
--- a/dev-lang/libcilkrts/Manifest
+++ b/dev-lang/libcilkrts/Manifest
@@ -1,20 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX libcilkrts-2546-build.patch 390 SHA256 74e26335bdc8665c4a22bbb05de714b04f0417f8cf9a0c101864c2d7b6c7ec0a SHA512 540bd086f2fcb380e3eea10ec8497be2289b2384e8046f9323c7f52f4002e4aeeeaf665b2f6b22c5e4cc9c4cacc6c790390870b07cfaaff4b39b4c5440707c75 WHIRLPOOL 35428ac1a6ec31edda05bf36e3e3e184fc6e9b6b46f4cffdddf4406dfb693424f676442780c89f333282e9f670afbe6edeaf33d710d88156ff8721223031e1ec
AUX libcilkrts-2546-include.patch 876 SHA256 8b5328aa4b388f5a3d2d9404eaa69f0aef369dcb2227916a4b8a2541d69df99d SHA512 c0c60046cd6b4cf096d342c0b0efbda4167f48e169e59ced63857c0df8edbe10d6a27e8e2fbf13ffbd51574078d2904a9183ce0eaf2a93ad6a634c6b57b30cf8 WHIRLPOOL 3aff03814de3b2e4c36406ae3adf676a6702c20f07eec35cd8681088353a54379848778b263c2eff921b2cb1ae82eaecd926781c2a23935f86acc7139b18f81d
-DIST cilkplus-rtl-002546.tgz 198451 SHA256 962d79a3d22368905598a1a04519ed931c9627cbf4132e72a0dafa22a0db65d4 SHA512 e4b645a43e2ce5ee8104728ba1914cc9506ccdf91215155e66ef2ffea86523e7a779eae156c7df4482aa73853a210e90c6c4a84cc09ff411ef883076a7e0d4bf WHIRLPOOL 1fa69bd2cb9aec7cccd2c051eaa2c781d447de4ed8ea89ab967a4cc4bc1e99cb35e45ba67a9948f6fa3a39dec2cd98aa5a6e9b7b02a063875de2976d713a0389
-EBUILD libcilkrts-2546.ebuild 679 SHA256 190d42837f0b5d8ee505031c8765343ec56154771eb9fc78c20320edb031dd4d SHA512 f16bb2cf21977449ea5b808dd3e3256775a643d22f545618ab284be77a93651b996b47429b976d9d0ea91f5959ca404566834fa799dfbe5c0fedd3b0d0894270 WHIRLPOOL f2ddcde9b6a51be1b3ead0ed2ad3d0892d86b398ebb2f572e7ee2544d209ab2a8a33c86f6b4811f0afa6b28b2b0168688594f23aa342f4a07e193555a5d8e76c
-MISC ChangeLog 664 SHA256 6f78e60542c979452ed799411d1294e5d44d0b4b233d691b55878a3d1ad6c90f SHA512 3012f8eac29608130702de123430ed2b215965500c652989f7453e78a297833b51d1d94d2278feda73f8cdc9e46ffd23d078a440c640b3f272ea62d3ff65b42a WHIRLPOOL c11b9ac693e41e298b0b1e7a725d06f1f8e3e9f9a7096b661f14c955ea4ff621ac1ffe1ef94d387245b7d44340b4db0593f5465a78585c7e4727bcc488c4325c
+AUX libcilkrts-2856-flags.patch 617 SHA256 d4da43f88eb511aa5478a68f02cc650f668dc69d37dfcff26a7366575b889414 SHA512 e861609aab82d377245373c55937e11472c66d0031bf2d2d5f079e38cc57750a4392922581462a20901b0f8ec3f372bd9a1dd42aadaf6b1ff2c5400919206f47 WHIRLPOOL 2479040c408ef9e0129e07d1929367e4f61287f81d905695821043b199fa759e901c230bd046e47047393edadd293ef6b222493e7bb73f24b4e3305b11f79ada
+DIST cilkplus-rtl-002856.tgz 200552 SHA256 b10755885c6d8c38f4d397e5a98974d2905b59c680913e09a5ccd922d3f70cb8 SHA512 45c9972af9aeb314b5b906d71ff61629b8e2f4736bc8c648adfd2a198e7230961cff80f3b1a1deb4be36ae46ca6e357034288a5780edf869139b7ad2e60c6af2 WHIRLPOOL f64a14d1bc272d75bbafee517ebff1783054e9fb5a1ba85950f918331f5f0e6e61cd7cd33ba11e7a0c2c7717fc025307760e6bb092be87dc95b74e5b4a01aefa
+EBUILD libcilkrts-2856.ebuild 670 SHA256 13332da846c2ee0370398de641d589ce5ca4883c700e6cb8e2ee4975dbf21bbe SHA512 50c716169c61a88558b846640045151b53822579afc750c515f593f7f49e74af94bfa8b8de61cd11f3e40040f4ed023b4af59868617a2035e7a918fa3aceb48b WHIRLPOOL 3d03c983f489f986f427a5c57d910b18a76b84812950f2a203caec36aa194480e3844e190afffab7365789ba229302089e448ac54c4531e66f2dc5188aa41571
+MISC ChangeLog 892 SHA256 ecc69f55707bc76532d617621e8c127b27baa6760b62e7a4af705309ae9bd1bb SHA512 dbb2cb65b6b85e57f0dddd04daa5ecfc93f960e0a20d15e3faaaba652e663f6a8e528778cc4bba2e5fedb426f02a7b1f8c2f833927ef4318e07fff20ed95c84a WHIRLPOOL ab8d5e1ccb5b89562971eaeb503d5274a258b9da08b16d04a930f092d19bc72bfea21dc4db9e6fea3921e41933ad17aa345720a4340768afba5cb4fb35344f64
MISC metadata.xml 237 SHA256 7b16ab35f387f952afdef31d1d5d20f82b69ec2e8a55bbe7215cf78ea322755d SHA512 52882e327ceb9391938e5b9fdfcb2f0d9c7380f71bed273c84357ecb0f1f0d4e704d9c53e4791dda1d7eed5df2c4c029281de182a5076849b26718fc83462cc6 WHIRLPOOL 1b5ae26efb6a0d0edd3e21494e52dbc7cfd1621316057dc8d876280444ceb302c94109b4e780982943a7837f19de8f11c85f49b137d31f41d7c79db6387dab90
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJQBh46AAoJEOeBhlrCAAWGX2QIAJUd7XY+LJpiOBz3222wqODm
-HBsxKNfoklY5CHuZ0l6reDPeaISZEtTBLIs128D5l0f66+ZMKRoJ6LDCi9zbdWoj
-oi4XAaD2f4VMKA4sk0fbENk8q2tKwrwgGrs529JdmtjbUGuNwPfsm4KmIIXSP80W
-y06MZhPQ94TdqxbVDSVmGeBV2rKcCbo3uOSSjNDI8+2XrYZUpDdtCXti5uJJlnz3
-BX/EXszK1qsckHOAtgWryUDQB4c/m64eiT0ucWQBO5PXOFjGM4LsTyRPkYtpftSN
-48wWyolftaqmbEI2dJ62Nh2p9itm5b81DlSHtsuJdfwuFyn+D/Y5nY8XG0sf1E0=
-=XHve
+iQEcBAEBCAAGBQJQ84yDAAoJEOeBhlrCAAWGgHsH/01Y0+YKORY6Dzp8JYkwJYEE
+tJSllYhxmwhn2WI4PFgk9aj8xDC8DB4anj4XRQUKCBAYd7bxFArFNUt/pXsReQ5F
++3O0/9jR11vXdnRaCMjMFHOLGKRAC5tPe257oxfhumkPlyWn2DB+li7Tfif7nGUf
+dMuxV8nVPqHPrcGzHPffEe7jqKkt00maT3C4sw0yzmPki9oZoBtjI1ZpIP0yEFWj
+/Vdj5HM3KC8pjQyRxiZOvSMSHQMiGQtpnYElIdjalVe71XcL29csjnC2h6m8o8if
+Zt860JKIUYRvjnsJH3EbRo8xfbK4LuFCCXBaN0iR65hiuOdpqx34muJEyuEasCQ=
+=zdTD
-----END PGP SIGNATURE-----
diff --git a/dev-lang/libcilkrts/files/libcilkrts-2546-build.patch b/dev-lang/libcilkrts/files/libcilkrts-2546-build.patch
deleted file mode 100644
index df77a17a605f..000000000000
--- a/dev-lang/libcilkrts/files/libcilkrts-2546-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur libcilkrts.orig/Makefile.am libcilkrts/Makefile.am
---- libcilkrts.orig/Makefile.am 2012-07-17 20:13:45.000000000 -0600
-+++ libcilkrts/Makefile.am 2012-07-17 20:13:55.000000000 -0600
-@@ -29,7 +29,6 @@
- # POSSIBILITY OF SUCH DAMAGE.
-
- AUTOMAKE_OPTIONS = foreign
--ACLOCAL_AMFLAGS = -I ..
-
- # Compiler and linker flags.
- GENERAL_FLAGS = -I$(top_srcdir)/include -DIN_CILK_RUNTIME=1
diff --git a/dev-lang/libcilkrts/files/libcilkrts-2856-flags.patch b/dev-lang/libcilkrts/files/libcilkrts-2856-flags.patch
new file mode 100644
index 000000000000..304d8e82372a
--- /dev/null
+++ b/dev-lang/libcilkrts/files/libcilkrts-2856-flags.patch
@@ -0,0 +1,18 @@
+diff -Naur libcilkrts.orig/Makefile.am libcilkrts/Makefile.am
+--- libcilkrts.orig/Makefile.am 2013-01-13 21:32:38.477690223 -0700
++++ libcilkrts/Makefile.am 2013-01-13 21:33:08.697795224 -0700
+@@ -38,12 +38,12 @@
+
+ # Compiler and linker flags.
+ GENERAL_FLAGS = -I$(top_srcdir)/include -DIN_CILK_RUNTIME=1
+-GENERAL_FLAGS += -fpic -O3
++GENERAL_FLAGS += -fpic
+ GENERAL_FLAGS += -DBUILD_USER=\"$(USER)\"
+ GENERAL_FLAGS += -DBUILD_HOST=\"`hostname`\"
+
+ # Enable Intel Cilk Plus extension
+-GENERAL_FLAGS += -fcilkplus
++#GENERAL_FLAGS += -fcilkplus
+
+ AM_CFLAGS = $(GENERAL_FLAGS) -std=c99
+ AM_CPPFLAGS = $(GENERAL_FLAGS)
diff --git a/dev-lang/libcilkrts/libcilkrts-2546.ebuild b/dev-lang/libcilkrts/libcilkrts-2856.ebuild
index d6fb184a0fc9..a4f81eff29b6 100644
--- a/dev-lang/libcilkrts/libcilkrts-2546.ebuild
+++ b/dev-lang/libcilkrts/libcilkrts-2856.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/libcilkrts/libcilkrts-2546.ebuild,v 1.1 2012/07/18 02:23:48 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/libcilkrts/libcilkrts-2856.ebuild,v 1.1 2013/01/14 04:41:37 ottxor Exp $
-EAPI=4
+EAPI=5
inherit autotools-utils
DESCRIPTION="Intel Cilk Plus run time library"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-cilk-plus/"
-SRC_URI="http://software.intel.com/file/44474 -> cilkplus-rtl-00${PV}.tgz"
+HOMEPAGE="http://cilkplus.org"
+SRC_URI="http://cilkplus.org/sites/default/files/runtime_source/cilkplus-rtl-00${PV}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="static-libs"
DEPEND=""
@@ -24,4 +24,4 @@ AUTOTOOLS_AUTORECONF=1
DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-build.patch" "${FILESDIR}/${P}-include.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2546-include.patch" "${FILESDIR}/${P}-flags.patch" )