diff options
Diffstat (limited to 'lang/sml-nj-devel/files')
-rw-r--r-- | lang/sml-nj-devel/files/do-patch-src-genposixnames | 33 | ||||
-rw-r--r-- | lang/sml-nj-devel/files/do-patch-src-installml | 48 | ||||
-rw-r--r-- | lang/sml-nj-devel/files/do-patch-src-mk.x86-freebsd | 11 | ||||
-rw-r--r-- | lang/sml-nj-devel/files/do-patch-src::system::installml | 15 | ||||
-rw-r--r-- | lang/sml-nj-devel/files/do-patch-src::system::makeml (renamed from lang/sml-nj-devel/files/do-patch-src-makeml) | 0 | ||||
-rw-r--r-- | lang/sml-nj-devel/files/do-patch-src::system::smlnj::installer::libinstall.sml | 53 | ||||
-rw-r--r-- | lang/sml-nj-devel/files/optional-patch-src::compiler::core.cm (renamed from lang/sml-nj-devel/files/optional-patch-flint-access) | 15 | ||||
-rw-r--r-- | lang/sml-nj-devel/files/patch-ab | 58 | ||||
-rw-r--r-- | lang/sml-nj-devel/files/patch-config::_arch-n-opsys (renamed from lang/sml-nj-devel/files/patch-ac) | 6 | ||||
-rw-r--r-- | lang/sml-nj-devel/files/patch-config::install.sh | 95 | ||||
-rw-r--r-- | lang/sml-nj-devel/files/patch-config::targets | 11 | ||||
-rw-r--r-- | lang/sml-nj-devel/files/plist-everything | 54 |
12 files changed, 209 insertions, 190 deletions
diff --git a/lang/sml-nj-devel/files/do-patch-src-genposixnames b/lang/sml-nj-devel/files/do-patch-src-genposixnames deleted file mode 100644 index b59f441d0803..000000000000 --- a/lang/sml-nj-devel/files/do-patch-src-genposixnames +++ /dev/null @@ -1,33 +0,0 @@ ---- src/runtime/config/gen-posix-names.sh.orig Mon Nov 27 14:24:39 2000 -+++ src/runtime/config/gen-posix-names.sh Tue Mar 11 23:09:11 2003 -@@ -39,17 +39,20 @@ - echo "#include <unistd.h>" > $SRCFILE - $CPP $SRCFILE > $INCLFILE - rm -f $SRCFILE --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-devel/files/do-patch-src-installml b/lang/sml-nj-devel/files/do-patch-src-installml deleted file mode 100644 index 542d987ece6a..000000000000 --- a/lang/sml-nj-devel/files/do-patch-src-installml +++ /dev/null @@ -1,48 +0,0 @@ ---- src/system/installml.orig Thu Jun 1 20:33:57 2000 -+++ src/system/installml Wed Aug 15 18:49:56 2001 -@@ -3,7 +3,7 @@ - # The tmpfile is for pathconfig editing (see below). - tmpfile=pathconfig.tmp.$$ - --trap 'rm -f $tmpfile; exit 1' 0 1 2 3 15 -+trap 'rm -f $tmpfile; exit 1' 1 2 3 15 - - this=$0 - here=`pwd` -@@ -11,8 +11,10 @@ - twoup=`pwd` - cd $here - --MAIN_HEAP_DIR=$twoup/bin/.heap --MAIN_LIB_DIR=$twoup/lib -+INSTALLROOT=${INSTALLROOT:-$twoup} -+ -+MAIN_HEAP_DIR=$INSTALLROOT/bin/.heap -+MAIN_LIB_DIR=$INSTALLROOT/lib - - if [ $# -gt 0 ] ; then - STEM=$1 -@@ -54,7 +56,7 @@ - fi - } - --HEAP_FILE=$STEM.$ARCH-$OPSYS -+HEAP_FILE=$STEM.$HEAP_SUFFIX - LIB_DIR=$STEM.lib - - if [ ! -f $HEAP_FILE ] ; then -@@ -68,7 +70,7 @@ - fi - - # Moving the heap image to its place --mv $HEAP_FILE $MAIN_HEAP_DIR/sml.$ARCH-$OPSYS -+mv $HEAP_FILE $MAIN_HEAP_DIR/sml.$HEAP_SUFFIX - - # Moving each individual library... - cd $LIB_DIR -@@ -94,4 +96,5 @@ - END { for (i in mapping) print i, mapping[i] }' \ - | sort >$pcfile - -+rm -f $tmpfile - rm -r $LIB_DIR diff --git a/lang/sml-nj-devel/files/do-patch-src-mk.x86-freebsd b/lang/sml-nj-devel/files/do-patch-src-mk.x86-freebsd deleted file mode 100644 index ec415313690b..000000000000 --- a/lang/sml-nj-devel/files/do-patch-src-mk.x86-freebsd +++ /dev/null @@ -1,11 +0,0 @@ ---- src/runtime/objs/mk.x86-freebsd.orig Mon Nov 6 22:41:04 2000 -+++ src/runtime/objs/mk.x86-freebsd Thu Aug 14 06:06:06 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-devel/files/do-patch-src::system::installml b/lang/sml-nj-devel/files/do-patch-src::system::installml new file mode 100644 index 000000000000..4b74cb918d0d --- /dev/null +++ b/lang/sml-nj-devel/files/do-patch-src::system::installml @@ -0,0 +1,15 @@ +--- src/system/installml.orig Tue May 11 21:20:17 2004 ++++ src/system/installml Thu Aug 5 22:17:28 2004 +@@ -11,8 +11,10 @@ + twoup=`pwd` + cd $here + +-MAIN_HEAP_DIR=$twoup/bin/.heap +-MAIN_LIB_DIR=$twoup/lib ++INSTALLROOT=${INSTALLROOT:-$twoup} ++ ++MAIN_HEAP_DIR=$INSTALLROOT/bin/.heap ++MAIN_LIB_DIR=$INSTALLROOT/lib + + if [ $# -gt 0 ] ; then + STEM=$1 diff --git a/lang/sml-nj-devel/files/do-patch-src-makeml b/lang/sml-nj-devel/files/do-patch-src::system::makeml index 8be80ccde9de..8be80ccde9de 100644 --- a/lang/sml-nj-devel/files/do-patch-src-makeml +++ b/lang/sml-nj-devel/files/do-patch-src::system::makeml diff --git a/lang/sml-nj-devel/files/do-patch-src::system::smlnj::installer::libinstall.sml b/lang/sml-nj-devel/files/do-patch-src::system::smlnj::installer::libinstall.sml new file mode 100644 index 000000000000..1ffa5bd5647e --- /dev/null +++ b/lang/sml-nj-devel/files/do-patch-src::system::smlnj::installer::libinstall.sml @@ -0,0 +1,53 @@ +--- src/system/smlnj/installer/libinstall.sml.orig Tue Jul 13 20:49:54 2004 ++++ src/system/smlnj/installer/libinstall.sml Thu Aug 12 01:23:08 2004 +@@ -78,9 +78,40 @@ + fun mkdir "" = () + | mkdir d = if fexists d then () else (mkdir (P.dir d); F.mkDir d) + ++ (* hack for cross-device moves *) ++ val move = if isUnix ++ then fn args as { old : string, new : string } => ++ let val xdev_exnName = "SysErr\000" ++ val xdev_exnMessage_substring = "xdev" ++ in F.rename args ++ handle exn => ++ if exnName exn = xdev_exnName ++ then if String.isSubstring xdev_exnMessage_substring ++ (exnMessage exn) ++ then if OS.Process.system ++ ("mv '" ^ old ^ "' '" ^ new ^ "'") ++ = OS.Process.success ++ then print ("(* cross device mv of \"" ^ old ++ ^ "\" to \"" ^ new ++ ^ "\" done. *)\n") ++ else fail ["move: mv " ^ old ^ " " ^ new ++ ^ " failed.\n"] ++ else ( print ("(* move: \"" ++ ^ xdev_exnMessage_substring ++ ^ "\" not found in \"" ++ ^ (exnMessage exn) ++ ^ "\". *)\n") ; ++ raise exn ) ++ else ( print ("(* move: \"" ^ xdev_exnName ++ ^ "\" != \"" ++ ^ (exnName exn) ^ "\". *)\n") ; ++ raise exn ) ++ end ++ else F.rename ++ + (* move a stable library file to its final location *) + fun movelib src dst () = +- (mkdir (P.dir dst); F.rename { old = src, new = dst }) ++ (mkdir (P.dir dst); move { old = src, new = dst }) + + (* register a temporary anchor-value binding *) + fun localanchor { anchor, path } = +@@ -325,7 +356,7 @@ + F.chDir treedir; + if OS.Process.system buildcmd = OS.Process.success then + if fexists targetheaploc then +- (F.rename { old = targetheaploc, ++ (move { old = targetheaploc, + new = finalheaploc }; + instcmd target; + #set (CM.Anchor.anchor target) (SOME bindir)) diff --git a/lang/sml-nj-devel/files/optional-patch-flint-access b/lang/sml-nj-devel/files/optional-patch-src::compiler::core.cm index 8469e964adb0..9b800c89ca0d 100644 --- a/lang/sml-nj-devel/files/optional-patch-flint-access +++ b/lang/sml-nj-devel/files/optional-patch-src::compiler::core.cm @@ -1,14 +1,12 @@ ---- src/compiler/core.cm.orig Fri Dec 14 22:01:23 2001 -+++ src/compiler/core.cm Thu Feb 28 02:43:48 2002 -@@ -81,6 +81,26 @@ - signature PICKMOD - signature UNPICKMOD - signature FLINT +--- src/compiler/core.cm.orig Fri Jul 16 05:26:38 2004 ++++ src/compiler/core.cm Fri Aug 6 00:23:27 2004 +@@ -109,6 +109,23 @@ + signature PPTYPE + signature ACCESS + signature UNIFY + + (* export of structures required to use FLINT directly -5- *) -+ structure Types + structure Translate -+ (* in 110.27 already exported above: structure FLINT *) + structure LtyKernel + structure PrimTyc + structure LtyDef @@ -21,7 +19,6 @@ + structure LambdaVar + structure ChkFlint + (* accessible via GenericVC: structure Symbol *) -+ structure Access + structure DebIndex + is diff --git a/lang/sml-nj-devel/files/patch-ab b/lang/sml-nj-devel/files/patch-ab deleted file mode 100644 index 718c362fbfaa..000000000000 --- a/lang/sml-nj-devel/files/patch-ab +++ /dev/null @@ -1,58 +0,0 @@ ---- config/install.sh.orig Thu Oct 17 15:07:53 2002 -+++ config/install.sh Mon Mar 17 02:11:26 2003 -@@ -550,6 +550,28 @@ - ###################################################################### - - # -+# do_patch patch-file -+# apply a patch file -+do_patch() { -+ patchfile=$FILESDIR/$1 -+ -+ if [ ! -r $patchfile ]; then -+ echo "$this: !!! patch file $patchfile not found." -+ exit 1; -+ fi -+ -+ if [ ! -f $CONFIGDIR/.patch_$1 ]; then -+ $PATCH $PATCH_ARGS < $patchfile || {\ -+ echo "$this: !!! patch file $patchfile failed to patch." -+ exit 1; -+ } -+ echo > $CONFIGDIR/.patch_$1 -+ else -+ echo "$this: patch $patchfile already installed." -+ fi -+} -+ -+# - # create the various sub directories - # - for dir in $BINDIR $HEAPDIR $RUNDIR $LIBDIR $SRCDIR ; do -@@ -656,6 +678,8 @@ - # build the run-time system - # - unpack "run-time" $SRCDIR runtime runtime -+do_patch do-patch-src-genposixnames -+do_patch do-patch-src-mk.x86-freebsd - if [ -x $RUNDIR/run.$ARCH-$OPSYS ]; then - vsay $this: Run-time system already exists. - else -@@ -664,7 +688,7 @@ - $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS - if [ -x run.$ARCH-$OPSYS ]; then - mv run.$ARCH-$OPSYS $RUNDIR -- $MAKE MAKE=$MAKE clean -+ [ "$MLNORUNTIMECLEAN" ] || $MAKE MAKE=$MAKE clean - else - complain "$this: !!! Run-time system build failed for some reason." - fi -@@ -728,6 +752,8 @@ - do - unpack $src $ROOT/src $src $src - done -+ do_patch do-patch-src-makeml -+ do_patch do-patch-src-installml - ;; - ml-yacc) - standalone ml-yacc ML-Yacc src diff --git a/lang/sml-nj-devel/files/patch-ac b/lang/sml-nj-devel/files/patch-config::_arch-n-opsys index 150a4ebb5d6e..1daf1a7f4070 100644 --- a/lang/sml-nj-devel/files/patch-ac +++ b/lang/sml-nj-devel/files/patch-config::_arch-n-opsys @@ -1,6 +1,6 @@ ---- config/_arch-n-opsys.orig Thu Oct 10 22:18:48 2002 -+++ config/_arch-n-opsys Sun Nov 10 23:59:17 2002 -@@ -100,6 +100,7 @@ +--- config/_arch-n-opsys.orig Mon Oct 27 15:46:57 2003 ++++ config/_arch-n-opsys Fri Nov 28 22:47:10 2003 +@@ -101,6 +101,7 @@ i486) ARCH=x86;; i586) ARCH=x86;; i686) ARCH=x86;; diff --git a/lang/sml-nj-devel/files/patch-config::install.sh b/lang/sml-nj-devel/files/patch-config::install.sh new file mode 100644 index 000000000000..d37984e2c11b --- /dev/null +++ b/lang/sml-nj-devel/files/patch-config::install.sh @@ -0,0 +1,95 @@ +--- config/install.sh.orig Sat Jul 31 00:55:23 2004 ++++ config/install.sh Thu Aug 12 16:14:55 2004 +@@ -12,6 +12,8 @@ + # Author: Matthias Blume (blume@tti-c.org) + # + ++[ -n "$RECOMPILEDIR" ] && echo "RECOMPILEDIR=$RECOMPILEDIR" ++ + if [ x${INSTALL_QUIETLY} = xtrue ] ; then + export CM_VERBOSE + CM_VERBOSE=false +@@ -32,6 +34,28 @@ + exit 1 + } + ++# ++# do_patch patch-file ++# apply a patch file ++do_patch() { ++ patchfile=$FILESDIR/$1 ++ ++ if [ ! -r $patchfile ]; then ++ echo "$this: !!! patch file $patchfile not found." ++ exit 1; ++ fi ++ ++ if [ ! -f $CONFIGDIR/.patch_$1 ]; then ++ $PATCH $PATCH_ARGS < $patchfile || {\ ++ echo "$this: !!! patch file $patchfile failed to patch." ++ exit 1; ++ } ++ echo > $CONFIGDIR/.patch_$1 ++ else ++ echo "$this: patch $patchfile already installed." ++ fi ++} ++ + this=$0 + + +@@ -299,7 +323,12 @@ + # the name of the bin files directory + # + BOOT_ARCHIVE=boot.$ARCH-unix +-BOOT_FILES=sml.$BOOT_ARCHIVE ++if [ -z "$RECOMPILEDIR" ] ++then ++ BOOT_FILES=sml.$BOOT_ARCHIVE ++else ++ BOOT_FILES=$RECOMPILEDIR/sml.$BOOT_ARCHIVE ++fi + + # + # build the run-time system +@@ -313,7 +342,7 @@ + $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS + if [ -x run.$ARCH-$OPSYS ]; then + mv run.$ARCH-$OPSYS $RUNDIR +- $MAKE MAKE=$MAKE clean ++ [ "$MLNORUNTIMECLEAN" ] || $MAKE MAKE=$MAKE clean + else + complain "$this: !!! Run-time system build failed for some reason." + fi +@@ -330,7 +359,7 @@ + export CM_DIR_ARC + CM_DIR_ARC=$ORIG_CM_DIR_ARC + else +- $CONFIGDIR/unpack $ROOT $BOOT_ARCHIVE ++ [ -n "$RECOMPILEDIR" ] || $CONFIGDIR/unpack $ROOT $BOOT_ARCHIVE + + fish $ROOT/$BOOT_FILES/basis.cm + +@@ -399,5 +428,22 @@ + else + complain "$this: !!! Installation of libraries and programs failed." + fi ++ ++# extract required sources ++while [ -n "$MLSOURCEUNPACKTARGETS" ] ++do ++ t=`echo "$MLSOURCEUNPACKTARGETS" | cut -f 1 -d " "` ++ $CONFIGDIR/unpack $ROOT $t ++ [ "$MLSOURCEUNPACKTARGETS" = "$t" ] && break ++ MLSOURCEUNPACKTARGETS=`echo "$MLSOURCEUNPACKTARGETS" | cut -f 2- -d " "` ++done ++# apply source patches ++while [ -n "$MLSOURCEPATCHES" ] ++do ++ p=`echo "$MLSOURCEPATCHES" | cut -f 1 -d " "` ++ do_patch $p ++ [ "$MLSOURCEPATCHES" = "$p" ] && break ++ MLSOURCEPATCHES=`echo "$MLSOURCEPATCHES" | cut -f 2- -d " "` ++done + + exit 0 diff --git a/lang/sml-nj-devel/files/patch-config::targets b/lang/sml-nj-devel/files/patch-config::targets new file mode 100644 index 000000000000..d0e010f35d77 --- /dev/null +++ b/lang/sml-nj-devel/files/patch-config::targets @@ -0,0 +1,11 @@ +--- config/targets.orig Thu Aug 5 00:05:00 2004 ++++ config/targets Tue Aug 10 11:00:56 2004 +@@ -68,7 +68,7 @@ + # pre-compile (certain) parts of MLRISC that are not already part of the SML/NJ + # compiler itself + # +-request mlrisc ++#request mlrisc + + # pre-compile and install the C-Kit, which is a library for parsing and + # type-checking C programs diff --git a/lang/sml-nj-devel/files/plist-everything b/lang/sml-nj-devel/files/plist-everything index 2fb22613d83a..11e1c4b06765 100644 --- a/lang/sml-nj-devel/files/plist-everything +++ b/lang/sml-nj-devel/files/plist-everything @@ -7,38 +7,36 @@ smlnj/bin/.heap/nowhere.%%MLARCH%%-bsd smlnj/bin/ml-burg smlnj/bin/ml-nlffigen smlnj/bin/nowhere -smlnj/lib/c/CM/%%MLARCH%%-unix/c.cm -smlnj/lib/c/internals/CM/%%MLARCH%%-unix/c-int.cm -smlnj/lib/c/memory/CM/%%MLARCH%%-unix/memory.cm -smlnj/lib/ckit-lib.cm/CM/%%MLARCH%%-unix/ckit-lib.cm -smlnj/lib/eXene.cm/CM/%%MLARCH%%-unix/eXene.cm -smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/match-compiler.cm -smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/parser.cm -smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/pp.cm -smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/prec-parser.cm -smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/sml-ast.cm -smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/source-map.cm -smlnj/lib/pgraph-util.cm/CM/%%MLARCH%%-unix/pgraph-util.cm -smlnj/src/runtime/config/gen-posix-names.sh.orig -smlnj/src/runtime/objs/mk.%%MLARCH%%-freebsd.orig -@dirrm smlnj/lib/eXene.cm/CM/%%MLARCH%%-unix -@dirrm smlnj/lib/eXene.cm/CM +smlnj/lib/c/.cm/%%MLARCH%%-unix/c.cm +smlnj/lib/c/internals/.cm/%%MLARCH%%-unix/c-int.cm +smlnj/lib/c/memory/.cm/%%MLARCH%%-unix/memory.cm +smlnj/lib/ckit-lib.cm/.cm/%%MLARCH%%-unix/ckit-lib.cm +smlnj/lib/eXene.cm/.cm/%%MLARCH%%-unix/eXene.cm +smlnj/lib/mlrisc-tools/.cm/%%MLARCH%%-unix/match-compiler.cm +smlnj/lib/mlrisc-tools/.cm/%%MLARCH%%-unix/parser.cm +smlnj/lib/mlrisc-tools/.cm/%%MLARCH%%-unix/pp.cm +smlnj/lib/mlrisc-tools/.cm/%%MLARCH%%-unix/prec-parser.cm +smlnj/lib/mlrisc-tools/.cm/%%MLARCH%%-unix/sml-ast.cm +smlnj/lib/mlrisc-tools/.cm/%%MLARCH%%-unix/source-map.cm +smlnj/lib/pgraph-util.cm/.cm/%%MLARCH%%-unix/pgraph-util.cm +@dirrm smlnj/lib/eXene.cm/.cm/%%MLARCH%%-unix +@dirrm smlnj/lib/eXene.cm/.cm @dirrm smlnj/lib/eXene.cm -@dirrm smlnj/lib/c/memory/CM/%%MLARCH%%-unix -@dirrm smlnj/lib/c/memory/CM +@dirrm smlnj/lib/c/memory/.cm/%%MLARCH%%-unix +@dirrm smlnj/lib/c/memory/.cm @dirrm smlnj/lib/c/memory -@dirrm smlnj/lib/c/internals/CM/%%MLARCH%%-unix -@dirrm smlnj/lib/c/internals/CM +@dirrm smlnj/lib/c/internals/.cm/%%MLARCH%%-unix +@dirrm smlnj/lib/c/internals/.cm @dirrm smlnj/lib/c/internals -@dirrm smlnj/lib/c/CM/%%MLARCH%%-unix -@dirrm smlnj/lib/c/CM +@dirrm smlnj/lib/c/.cm/%%MLARCH%%-unix +@dirrm smlnj/lib/c/.cm @dirrm smlnj/lib/c -@dirrm smlnj/lib/ckit-lib.cm/CM/%%MLARCH%%-unix -@dirrm smlnj/lib/ckit-lib.cm/CM +@dirrm smlnj/lib/ckit-lib.cm/.cm/%%MLARCH%%-unix +@dirrm smlnj/lib/ckit-lib.cm/.cm @dirrm smlnj/lib/ckit-lib.cm -@dirrm smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix -@dirrm smlnj/lib/mlrisc-tools/CM +@dirrm smlnj/lib/mlrisc-tools/.cm/%%MLARCH%%-unix +@dirrm smlnj/lib/mlrisc-tools/.cm @dirrm smlnj/lib/mlrisc-tools -@dirrm smlnj/lib/pgraph-util.cm/CM/%%MLARCH%%-unix -@dirrm smlnj/lib/pgraph-util.cm/CM +@dirrm smlnj/lib/pgraph-util.cm/.cm/%%MLARCH%%-unix +@dirrm smlnj/lib/pgraph-util.cm/.cm @dirrm smlnj/lib/pgraph-util.cm |