Fixed for automake-1.12, disable force tests, force CFLAGS=-O1 (bug #423553)

(Portage version: 2.1.11.1/cvs/Linux x86_64)

4 files changed, 118 insertions, 38 deletions

diff --git a/dev-lang/cilk/ChangeLog b/dev-lang/cilk/ChangeLog
index 417084055910..c92be47f891d 100644
--- a/dev-lang/cilk/ChangeLog
+++ b/dev-lang/cilk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/cilk
-# 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 $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cilk/ChangeLog,v 1.3 2012/06/28 06:21:59 bicatali Exp $
+
+*cilk-5.4.6-r1 (28 Jun 2012)
+
+  28 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> +cilk-5.4.6-r1.ebuild,
+  +files/cilk-5.4.6-autotools.patch, -cilk-5.4.6.ebuild:
+  Fixed for automake-1.12, disable force tests, force CFLAGS=-O1 (bug #423553)
 
   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
@@ -14,4 +20,3 @@
   20 Feb 2008; Michał Kiedrowicz (esqualante) <esqualante@o2.pl>
   +metadata.xml, +cilk-5.4.6.ebuild:
   New Ebuild for bug #210816 thanks to Tommy[D], Ken69267 and tcunha
-
diff --git a/dev-lang/cilk/cilk-5.4.6-r1.ebuild b/dev-lang/cilk/cilk-5.4.6-r1.ebuild
new file mode 100644
index 000000000000..07cf1ade0949
--- /dev/null
+++ b/dev-lang/cilk/cilk-5.4.6-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 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-r1.ebuild,v 1.1 2012/06/28 06:21:58 bicatali Exp $
+
+EAPI=4
+inherit flag-o-matic autotools eutils
+
+DESCRIPTION="Language for multithreaded parallel programming based on ANSI C"
+HOMEPAGE="http://supertech.csail.mit.edu/cilk"
+SRC_URI="http://supertech.csail.mit.edu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples static-libs"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -D_XOPEN_SOURCE=500
+	# too many flags do not work, force -O1
+	econf --with-perfctr=no $(use_enable static-libs static) CFLAGS=-O1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc NEWS README THANKS
+	use doc && dodoc doc/manual.pdf
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-lang/cilk/cilk-5.4.6.ebuild b/dev-lang/cilk/cilk-5.4.6.ebuild
deleted file mode 100644
index 641fa4031644..000000000000
--- a/dev-lang/cilk/cilk-5.4.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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.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."
-HOMEPAGE="http://supertech.csail.mit.edu/${PN}/"
-SRC_URI="http://supertech.csail.mit.edu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples static-libs"
-
-src_prepare() {
-	# cilk compiler doesn't like this flags...
-	filter-flags "-pipe"
-	filter-flags "-ggdb"
-	append-cppflags -D_XOPEN_SOURCE=500
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc NEWS README THANKS
-
-	insinto /usr/share/doc/${PF}
-	use doc && doins doc/manual.pdf
-	use examples && doins -r examples
-}
diff --git a/dev-lang/cilk/files/cilk-5.4.6-autotools.patch b/dev-lang/cilk/files/cilk-5.4.6-autotools.patch
new file mode 100644
index 000000000000..7287ca79597f
--- /dev/null
+++ b/dev-lang/cilk/files/cilk-5.4.6-autotools.patch
@@ -0,0 +1,74 @@
+diff -Nur cilk-5.4.6.orig/cilk2c/Makefile.am cilk-5.4.6/cilk2c/Makefile.am
+--- cilk-5.4.6.orig/cilk2c/Makefile.am	2012-06-28 06:19:51.000000000 +0100
++++ cilk-5.4.6/cilk2c/Makefile.am	2012-06-28 06:59:42.000000000 +0100
+@@ -1,4 +1,6 @@
+-pkglib_PROGRAMS = cilk2c
++pkglibexec_PROGRAMS = cilk2c
++
++BUILT_SOURCES = ANSI-C.c ANSI-C.h
+ 
+ cilk2c_SOURCES = analyze.c ast.c complex-types.c constexpr.c		\
+ container.c conversions.c dataflow.c elide.c initializer.c list.c	\
+diff -Nur cilk-5.4.6.orig/configure.ac cilk-5.4.6/configure.ac
+--- cilk-5.4.6.orig/configure.ac	2012-06-28 06:19:51.000000000 +0100
++++ cilk-5.4.6/configure.ac	2012-06-28 06:41:26.000000000 +0100
+@@ -1,8 +1,8 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT
+ AC_CONFIG_SRCDIR([config.h.in])
+-AM_CONFIG_HEADER([config.h runtime/cilk-sysdep.h])
+-AC_PREREQ(2.53)
++AC_CONFIG_HEADERS([config.h runtime/cilk-sysdep.h])
++AC_PREREQ(2.68)
+ AM_INIT_AUTOMAKE(cilk, 5.4.6)
+ AC_CANONICAL_HOST
+ 
+@@ -20,7 +20,7 @@
+ 
+ dnl Checks for required programs.
+ if test "$GCC" != "yes"; then
+-   AC_ERROR("I cannot find gcc.  gcc is required for Cilk to work.")
++   AC_MSG_ERROR("I cannot find gcc.  gcc is required for Cilk to work.")
+ fi
+ 
+ dnl Checks for libraries.
+diff -Nur cilk-5.4.6.orig/examples/Makefile.am cilk-5.4.6/examples/Makefile.am
+--- cilk-5.4.6.orig/examples/Makefile.am	2012-06-28 06:19:51.000000000 +0100
++++ cilk-5.4.6/examples/Makefile.am	2012-06-28 06:36:56.000000000 +0100
+@@ -11,7 +11,7 @@
+ CILKLINK = $(CILKLD) $(AM_CILKFLAGS) $(CILKFLAGS) $(PERFCTR_LIBS) $(LDFLAGS) -o $@
+ LINK=$(CILKLINK)
+ 
+-noinst_PROGRAMS=hello fib fib-serial testall ck magic knapsack queens	\
++check_PROGRAMS=hello fib fib-serial testall ck magic knapsack queens	\
+ cilksort fft test-locks bucket cholesky game nfib kalah matmul lu plu	\
+ heat test-errno strassen rectmul spacemul \
+ test-void-func \
+@@ -58,7 +58,7 @@
+ EXTRA_DIST = knapsack-example1.input knapsack-example2.input	\
+ knapsack-example3.input
+ 
+-check:  hello testall fft fib lu matmul cilksort heat test-locks test-errno
++check-local:  hello testall fft fib lu matmul cilksort heat test-locks test-errno
+ 	@echo "Runnig Cilk tests.  This will take a while."
+ 	./hello $(PROGFLAGS)
+ 	./test-void-func $(PROGFLAGS)
+diff -Nur cilk-5.4.6.orig/runtime/Makefile.am cilk-5.4.6/runtime/Makefile.am
+--- cilk-5.4.6.orig/runtime/Makefile.am	2012-06-28 06:19:51.000000000 +0100
++++ cilk-5.4.6/runtime/Makefile.am	2012-06-28 06:27:57.000000000 +0100
+@@ -1,5 +1,5 @@
+ lib_LTLIBRARIES = libcilk.la libcilk.g.la libcilk.p.la libcilk.g.p.la
+-pkglib_LIBRARIES = libcilkrt0.a libcilkrt0g.a libcilkrt0p.a libcilkrt0gp.a
++lib_LIBRARIES = libcilkrt0.a libcilkrt0g.a libcilkrt0p.a libcilkrt0gp.a
+ 
+ CILK_HFILES = cilk-cilk2c.h cilk.h cilk-lib.h cilk-lib.cilkh	\
+ gcc-builtin.h cilk-cilk2c-pre.h
+@@ -8,7 +8,7 @@
+ cmdline.c internal-malloc.c timing.c invoke-main.c malloc.c debug.c	\
+ workers.c mutex.c
+ 
+-pkginclude_HEADERS = $(CILK_HFILES) cilk-conf.h cilk-sysdep.h
++include_HEADERS = $(CILK_HFILES) cilk-conf.h cilk-sysdep.h
+ 
+ CILK_SRC = cilk-internal.h $(CILK_CFILES) $(CILK_HFILES)
+ COMMON_LINK_FLAGS = -version-info 1:3:0 @PTHREAD_LIBS@