diff options
| author | Joseph Koshy <jkoshy@FreeBSD.org> | 2003-08-15 07:24:45 +0000 |
|---|---|---|
| committer | Joseph Koshy <jkoshy@FreeBSD.org> | 2003-08-15 07:24:45 +0000 |
| commit | 7ad3fa14370aaedb00a5f7830874f639371e86bd (patch) | |
| tree | f86b10e2de9851ca8f7dcf472855bf061a9bce67 /lang | |
| parent | Update to 4.12. (diff) | |
Fix build breakage with the GCC 3.3.1.
Submitted by: Johannes 5 Joemann <joemann@beefree.free.de>
Notes
Notes:
svn path=/head/; revision=86976
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/sml-nj/files/extra-patch-cpp | 11 | ||||
| -rw-r--r-- | lang/sml-nj/files/patch-ab | 6 |
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 |