| 1 |
bicatali 12/06/28 06:21:59 |
| 2 |
|
| 3 |
Added: cilk-5.4.6-autotools.patch |
| 4 |
Log: |
| 5 |
Fixed for automake-1.12, disable force tests, force CFLAGS=-O1 (bug #423553) |
| 6 |
|
| 7 |
(Portage version: 2.1.11.1/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-lang/cilk/files/cilk-5.4.6-autotools.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/cilk/files/cilk-5.4.6-autotools.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/cilk/files/cilk-5.4.6-autotools.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: cilk-5.4.6-autotools.patch |
| 16 |
=================================================================== |
| 17 |
diff -Nur cilk-5.4.6.orig/cilk2c/Makefile.am cilk-5.4.6/cilk2c/Makefile.am |
| 18 |
--- cilk-5.4.6.orig/cilk2c/Makefile.am 2012-06-28 06:19:51.000000000 +0100 |
| 19 |
+++ cilk-5.4.6/cilk2c/Makefile.am 2012-06-28 06:59:42.000000000 +0100 |
| 20 |
@@ -1,4 +1,6 @@ |
| 21 |
-pkglib_PROGRAMS = cilk2c |
| 22 |
+pkglibexec_PROGRAMS = cilk2c |
| 23 |
+ |
| 24 |
+BUILT_SOURCES = ANSI-C.c ANSI-C.h |
| 25 |
|
| 26 |
cilk2c_SOURCES = analyze.c ast.c complex-types.c constexpr.c \ |
| 27 |
container.c conversions.c dataflow.c elide.c initializer.c list.c \ |
| 28 |
diff -Nur cilk-5.4.6.orig/configure.ac cilk-5.4.6/configure.ac |
| 29 |
--- cilk-5.4.6.orig/configure.ac 2012-06-28 06:19:51.000000000 +0100 |
| 30 |
+++ cilk-5.4.6/configure.ac 2012-06-28 06:41:26.000000000 +0100 |
| 31 |
@@ -1,8 +1,8 @@ |
| 32 |
dnl Process this file with autoconf to produce a configure script. |
| 33 |
AC_INIT |
| 34 |
AC_CONFIG_SRCDIR([config.h.in]) |
| 35 |
-AM_CONFIG_HEADER([config.h runtime/cilk-sysdep.h]) |
| 36 |
-AC_PREREQ(2.53) |
| 37 |
+AC_CONFIG_HEADERS([config.h runtime/cilk-sysdep.h]) |
| 38 |
+AC_PREREQ(2.68) |
| 39 |
AM_INIT_AUTOMAKE(cilk, 5.4.6) |
| 40 |
AC_CANONICAL_HOST |
| 41 |
|
| 42 |
@@ -20,7 +20,7 @@ |
| 43 |
|
| 44 |
dnl Checks for required programs. |
| 45 |
if test "$GCC" != "yes"; then |
| 46 |
- AC_ERROR("I cannot find gcc. gcc is required for Cilk to work.") |
| 47 |
+ AC_MSG_ERROR("I cannot find gcc. gcc is required for Cilk to work.") |
| 48 |
fi |
| 49 |
|
| 50 |
dnl Checks for libraries. |
| 51 |
diff -Nur cilk-5.4.6.orig/examples/Makefile.am cilk-5.4.6/examples/Makefile.am |
| 52 |
--- cilk-5.4.6.orig/examples/Makefile.am 2012-06-28 06:19:51.000000000 +0100 |
| 53 |
+++ cilk-5.4.6/examples/Makefile.am 2012-06-28 06:36:56.000000000 +0100 |
| 54 |
@@ -11,7 +11,7 @@ |
| 55 |
CILKLINK = $(CILKLD) $(AM_CILKFLAGS) $(CILKFLAGS) $(PERFCTR_LIBS) $(LDFLAGS) -o $@ |
| 56 |
LINK=$(CILKLINK) |
| 57 |
|
| 58 |
-noinst_PROGRAMS=hello fib fib-serial testall ck magic knapsack queens \ |
| 59 |
+check_PROGRAMS=hello fib fib-serial testall ck magic knapsack queens \ |
| 60 |
cilksort fft test-locks bucket cholesky game nfib kalah matmul lu plu \ |
| 61 |
heat test-errno strassen rectmul spacemul \ |
| 62 |
test-void-func \ |
| 63 |
@@ -58,7 +58,7 @@ |
| 64 |
EXTRA_DIST = knapsack-example1.input knapsack-example2.input \ |
| 65 |
knapsack-example3.input |
| 66 |
|
| 67 |
-check: hello testall fft fib lu matmul cilksort heat test-locks test-errno |
| 68 |
+check-local: hello testall fft fib lu matmul cilksort heat test-locks test-errno |
| 69 |
@echo "Runnig Cilk tests. This will take a while." |
| 70 |
./hello $(PROGFLAGS) |
| 71 |
./test-void-func $(PROGFLAGS) |
| 72 |
diff -Nur cilk-5.4.6.orig/runtime/Makefile.am cilk-5.4.6/runtime/Makefile.am |
| 73 |
--- cilk-5.4.6.orig/runtime/Makefile.am 2012-06-28 06:19:51.000000000 +0100 |
| 74 |
+++ cilk-5.4.6/runtime/Makefile.am 2012-06-28 06:27:57.000000000 +0100 |
| 75 |
@@ -1,5 +1,5 @@ |
| 76 |
lib_LTLIBRARIES = libcilk.la libcilk.g.la libcilk.p.la libcilk.g.p.la |
| 77 |
-pkglib_LIBRARIES = libcilkrt0.a libcilkrt0g.a libcilkrt0p.a libcilkrt0gp.a |
| 78 |
+lib_LIBRARIES = libcilkrt0.a libcilkrt0g.a libcilkrt0p.a libcilkrt0gp.a |
| 79 |
|
| 80 |
CILK_HFILES = cilk-cilk2c.h cilk.h cilk-lib.h cilk-lib.cilkh \ |
| 81 |
gcc-builtin.h cilk-cilk2c-pre.h |
| 82 |
@@ -8,7 +8,7 @@ |
| 83 |
cmdline.c internal-malloc.c timing.c invoke-main.c malloc.c debug.c \ |
| 84 |
workers.c mutex.c |
| 85 |
|
| 86 |
-pkginclude_HEADERS = $(CILK_HFILES) cilk-conf.h cilk-sysdep.h |
| 87 |
+include_HEADERS = $(CILK_HFILES) cilk-conf.h cilk-sysdep.h |
| 88 |
|
| 89 |
CILK_SRC = cilk-internal.h $(CILK_CFILES) $(CILK_HFILES) |
| 90 |
COMMON_LINK_FLAGS = -version-info 1:3:0 @PTHREAD_LIBS@ |
Archives