summaryrefslogtreecommitdiff
path: root/lang/nhc98
diff options
context:
space:
mode:
authorkristerw <kristerw@pkgsrc.org>2004-01-16 20:03:59 +0000
committerkristerw <kristerw@pkgsrc.org>2004-01-16 20:03:59 +0000
commit93f1a45e28804be28d770638f497bed2480d0056 (patch)
tree395b0fb9694b85585d2fb7f77d94185589d278f5 /lang/nhc98
parent25103bd7c5380ae3b4367ce3ba4e00ef4386bed3 (diff)
downloadpkgsrc-93f1a45e28804be28d770638f497bed2480d0056.tar.gz
Fix build problem on NetBSD -current.
Diffstat (limited to 'lang/nhc98')
-rw-r--r--lang/nhc98/distinfo4
-rw-r--r--lang/nhc98/patches/patch-ae21
2 files changed, 19 insertions, 6 deletions
diff --git a/lang/nhc98/distinfo b/lang/nhc98/distinfo
index a780caa835c..e465514c786 100644
--- a/lang/nhc98/distinfo
+++ b/lang/nhc98/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2004/01/16 00:59:18 kristerw Exp $
+$NetBSD: distinfo,v 1.11 2004/01/16 20:03:59 kristerw Exp $
SHA1 (nhc98src-1.16.tar.gz) = 7ca27c190d06462cab5d642726b7e5e73b61a7e4
Size (nhc98src-1.16.tar.gz) = 5689485 bytes
@@ -6,6 +6,6 @@ SHA1 (patch-aa) = ba484e67af2574abda0708f882e4c5f973ef125e
SHA1 (patch-ab) = 064fe3b954dadf46155a3ddcd1e0ba439ff5167d
SHA1 (patch-ac) = 514a8e8d74a4efb6149734c95b9b4f0c72678218
SHA1 (patch-ad) = 53ff3bf9b71810c024df1ed04103964f0d65848f
-SHA1 (patch-ae) = 89a661248bddb6dddbac232fe9abba81cc0db172
+SHA1 (patch-ae) = b3cebbf940f03cfb250743991f52b2b7999f923f
SHA1 (patch-af) = 0036a99ddd54f86679faa2d564fab1297aa00273
SHA1 (patch-ag) = 613b06d92328ff649ea8d3cd198b058f0354654a
diff --git a/lang/nhc98/patches/patch-ae b/lang/nhc98/patches/patch-ae
index b54c899425d..1b271daf409 100644
--- a/lang/nhc98/patches/patch-ae
+++ b/lang/nhc98/patches/patch-ae
@@ -1,8 +1,21 @@
-$NetBSD: patch-ae,v 1.1 2004/01/16 00:59:18 kristerw Exp $
+$NetBSD: patch-ae,v 1.2 2004/01/16 20:03:59 kristerw Exp $
---- script/nhc98.inst.orig 2003-03-07 16:48:45.000000000 +0000
-+++ script/nhc98.inst 2003-12-16 16:30:11.000000000 +0000
-@@ -543,6 +543,7 @@
+--- script/nhc98.inst.orig Fri Mar 7 17:48:45 2003
++++ script/nhc98.inst Fri Jan 16 17:59:50 2004
+@@ -71,6 +71,12 @@
+ MAINROUTINE=$NHC98LIBDIR/$MACHINE/main
+
+ CC=${CC-gcc}" -D__NHC__=$VERSIONNUM"
++gcc_ver=`gcc -dumpversion`
++gcc_ver_major=`expr "$gcc_ver" : '\([0-9]*\)'`
++gcc_ver_minor=`expr "$gcc_ver" : '[0-9]*\.\([0-9]*\)'`
++if test $gcc_ver_major -eq 3 -a $gcc_ver_minor -ge 3; then
++ CC="${CC} -fno-zero-initialized-in-bss"
++fi
+
+ CPPDEFAULT="${CC} -D__HASKELL__=98 -D__HASKELL_98__ -D__HASKELL98__ -x c -E"
+
+@@ -543,6 +549,7 @@
echo $CPPAS $ENDIAN $CPPASFLAGS $CINCDIRS $TMPCPPASFILE -o $TMPASFILE
fi
$CPPAS $ENDIAN $CPPASFLAGS $CINCDIRS $TMPCPPASFILE -o - | \