diff options
| author | Joseph Koshy <jkoshy@FreeBSD.org> | 2003-03-30 00:36:22 +0000 |
|---|---|---|
| committer | Joseph Koshy <jkoshy@FreeBSD.org> | 2003-03-30 00:36:22 +0000 |
| commit | 7daabed8b996069ad42b95e1eaa73a6114fbc138 (patch) | |
| tree | 3b0f8bfb814f923249f86469897006d1144ab557 /lang/sml-nj | |
| parent | Upgrade to the 24-March-2003 GCC 3.3 in-development snapshot. (diff) | |
Make this port build on 5-CURRENT.
Notes
Notes:
svn path=/head/; revision=77706
Diffstat (limited to 'lang/sml-nj')
| -rw-r--r-- | lang/sml-nj/files/extra-patch-genposixnames | 33 | ||||
| -rw-r--r-- | lang/sml-nj/files/patch-ab | 10 |
2 files changed, 40 insertions, 3 deletions
diff --git a/lang/sml-nj/files/extra-patch-genposixnames b/lang/sml-nj/files/extra-patch-genposixnames new file mode 100644 index 000000000000..c1301b1b8b7b --- /dev/null +++ b/lang/sml-nj/files/extra-patch-genposixnames @@ -0,0 +1,33 @@ +--- src/runtime/config/gen-posix-names.sh.orig Tue Oct 10 21:26:35 2000 ++++ src/runtime/config/gen-posix-names.sh Tue Mar 11 22:50:21 2003 +@@ -36,17 +36,20 @@ + /lib/cpp > $INCLFILE <<XXX + #include <unistd.h> + XXX +-elif [ -r "/usr/include/sys/unistd.h" ]; then +- INCLFILE=/usr/include/sys/unistd.h +-elif [ -r "/usr/include/confname.h" ]; then +- INCLFILE=/usr/include/confname.h +-elif [ -r "/usr/include/unistd.h" ]; then +- INCLFILE=/usr/include/unistd.h +-elif [ -r "/usr/include/bsd/unistd.h" ]; then +- INCLFILE=/usr/include/bsd/unistd.h + else +- echo "gen-posix-names.sh: unable to find <unistd.h>" +- exit 1 ++ INCLFILE="" ++ for f in "/usr/include/sys/unistd.h" \ ++ "/usr/include/confname.h" \ ++ "/usr/include/unistd.h" \ ++ "/usr/include/bsd/unistd.h"; do ++ if [ -r "$f" ]; then ++ INCLFILE="$INCLFILE $f" ++ fi ++ done ++ if [ -z "$INCLFILE" ]; then ++ echo "gen-posix-names.sh: unable to find <unistd.h>" ++ exit 1 ++ fi + fi + + echo "/* $OUTF" >> $OUTF diff --git a/lang/sml-nj/files/patch-ab b/lang/sml-nj/files/patch-ab index 6e9c75bb0469..8d3c6f6edc31 100644 --- a/lang/sml-nj/files/patch-ab +++ b/lang/sml-nj/files/patch-ab @@ -1,6 +1,6 @@ ---- config/install.sh.orig Wed Aug 5 13:43:43 1998 -+++ config/install.sh Sat Jan 29 20:46:09 2000 -@@ -181,6 +181,18 @@ +--- 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 @@ if [ "$?" != "0" ]; then exit $? fi @@ -10,6 +10,10 @@ +if [ -f $patch_file ]; then + $PATCH $PATCH_ARGS < $patch_file +fi ++patch_file="${FILESDIR}/extra-patch-genposixnames" ++if [ -f $patch_file ]; then ++ $PATCH $PATCH_ARGS < $patch_file ++fi +if grep -w FPE_INTDIV /usr/include/machine/trap.h > /dev/null 2>&1; then + patch_file="${FILESDIR}/extra-patch-signals" + if [ -f $patch_file ]; then |