aboutsummaryrefslogtreecommitdiffstats
path: root/lang/sml-nj
diff options
context:
space:
mode:
authorjkoshy <jkoshy@FreeBSD.org>2003-08-15 15:24:45 +0800
committerjkoshy <jkoshy@FreeBSD.org>2003-08-15 15:24:45 +0800
commitc8af610e09dd50f9ebaaf512126859866e6af0f9 (patch)
tree5ad433a727ec0c7c9aab9f799d21ede0ba70f077 /lang/sml-nj
parent0dc4f7abcb3f060466d073ca091842e60c072f31 (diff)
downloadfreebsd-ports-gnome-c8af610e09dd50f9ebaaf512126859866e6af0f9.tar.gz
freebsd-ports-gnome-c8af610e09dd50f9ebaaf512126859866e6af0f9.tar.zst
freebsd-ports-gnome-c8af610e09dd50f9ebaaf512126859866e6af0f9.zip
Fix build breakage with the GCC 3.3.1.
Submitted by: Johannes 5 Joemann <joemann@beefree.free.de>
Diffstat (limited to 'lang/sml-nj')
-rw-r--r--lang/sml-nj/files/extra-patch-cpp11
-rw-r--r--lang/sml-nj/files/patch-ab6
2 files changed, 16 insertions, 1 deletions
diff --git a/lang/sml-nj/files/extra-patch-cpp b/lang/sml-nj/files/extra-patch-cpp
new file mode 100644
index 000000000000..adb08fd8a575
--- /dev/null
+++ b/lang/sml-nj/files/extra-patch-cpp
@@ -0,0 +1,11 @@
+--- src/runtime/objs/mk.x86-freebsd.orig Fri Aug 15 11:39:43 2003
++++ src/runtime/objs/mk.x86-freebsd Fri Aug 15 11:39:59 2003
+@@ -10,7 +10,7 @@
+ ARFLAGS = Trcv
+ CC = gcc -ansi
+ CFLAGS = -O2
+-CPP = gcc -x c -E -P -ansi
++CPP = gcc -x assembler-with-cpp -E -P
+ #CPP = /usr/bin/cpp -P
+
+ XOBJS =
diff --git a/lang/sml-nj/files/patch-ab b/lang/sml-nj/files/patch-ab
index 8d3c6f6edc31..0329e1b1a454 100644
--- a/lang/sml-nj/files/patch-ab
+++ b/lang/sml-nj/files/patch-ab
@@ -1,11 +1,15 @@
--- config/install.sh.orig Fri Oct 20 16:02:25 2000
+++ config/install.sh Tue Mar 11 22:30:59 2003
-@@ -155,6 +155,22 @@
+@@ -155,6 +155,26 @@
if [ "$?" != "0" ]; then
exit $?
fi
+# we need to patch just before build
+echo "applying source patches"
++patch_file="${FILESDIR}/extra-patch-cpp"
++if [ -f $patch_file ]; then
++ $PATCH $PATCH_ARGS < $patch_file
++fi
+patch_file="${FILESDIR}/extra-patch-global-names"
+if [ -f $patch_file ]; then
+ $PATCH $PATCH_ARGS < $patch_file