summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authordmcmahill <dmcmahill>2002-07-18 00:54:36 +0000
committerdmcmahill <dmcmahill>2002-07-18 00:54:36 +0000
commitb9c9e6bb446d3309362583b512f2c29176bfa2d6 (patch)
tree2bb5965ab4adfb07d3d7dcc4c06e045d98485363 /lang
parentbe5f7e83f397e24afb76fca022bd601f16797147 (diff)
downloadpkgsrc-b9c9e6bb446d3309362583b512f2c29176bfa2d6.tar.gz
repair compilation on pre gcc-2.95.* systems broken by last commit.
Should still work on gcc-2.95.* systems.
Diffstat (limited to 'lang')
-rw-r--r--lang/cilk/distinfo4
-rw-r--r--lang/cilk/patches/patch-ab25
2 files changed, 16 insertions, 13 deletions
diff --git a/lang/cilk/distinfo b/lang/cilk/distinfo
index d6c780ade08..be8012373dc 100644
--- a/lang/cilk/distinfo
+++ b/lang/cilk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2002/07/17 08:36:11 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/07/18 00:54:36 dmcmahill Exp $
SHA1 (cilk-5.3.1.tar.gz) = 2a0d142badc7be57787c4608fc07b98090207994
Size (cilk-5.3.1.tar.gz) = 848755 bytes
SHA1 (patch-aa) = de31546280810242eb44f1d06ded023d23109092
-SHA1 (patch-ab) = e4ae168977deb547e9c388ebcf2bac4dc7d8bbcd
+SHA1 (patch-ab) = c8bb837869e3dced44aeff03ba36879929e9251f
diff --git a/lang/cilk/patches/patch-ab b/lang/cilk/patches/patch-ab
index 3ac9e6be93e..c2ce5460932 100644
--- a/lang/cilk/patches/patch-ab
+++ b/lang/cilk/patches/patch-ab
@@ -1,13 +1,16 @@
-$NetBSD: patch-ab,v 1.1 2002/07/17 08:36:12 agc Exp $
+$NetBSD: patch-ab,v 1.2 2002/07/18 00:54:36 dmcmahill Exp $
---- support/Makefile.in 2002/07/17 08:20:43 1.1
-+++ support/Makefile.in 2002/07/17 08:21:04
-@@ -83,7 +83,7 @@
- CILK_PAGESIZE = @CILK_PAGESIZE@
- PTHREAD_LIBS = @PTHREAD_LIBS@ @HOARD_LIBS@
- GNU_LD = "@HAVE_GNU_LD@"
--CPP_FOR_CILK = @CPP_FOR_CILK@
-+CPP_FOR_CILK = cpp0
-
- CC = ./cilk-local
+--- configure.orig Wed Jul 17 19:18:48 2002
++++ configure
+@@ -2074,10 +2074,7 @@
+ { echo "configure: error: "gcc does not accept the --specs option. Please upgrade gcc to v2.95 or newer."" 1>&2; exit 1; }
+ fi
+-if test "$HAVE_GCC_2_96" = "yes"; then
+- echo "WARNING: I found gcc-2.96. This version of gcc is untested with Cilk."
+- echo "Please report any problem to cilk-support@lists.sourceforge.net"
+-
++if test -f /usr/libexec/cpp0; then
+ CPP_FOR_CILK=cpp0
+ else
+ CPP_FOR_CILK=cpp