diff options
Diffstat (limited to 'lang/sml-nj-devel/files')
| -rw-r--r-- | lang/sml-nj-devel/files/extra-patch-global-names | 8 | ||||
| -rw-r--r-- | lang/sml-nj-devel/files/extra-patch-signals | 21 | ||||
| -rw-r--r-- | lang/sml-nj-devel/files/patch-ab | 58 | ||||
| -rw-r--r-- | lang/sml-nj-devel/files/targets.customized | 98 |
4 files changed, 140 insertions, 45 deletions
diff --git a/lang/sml-nj-devel/files/extra-patch-global-names b/lang/sml-nj-devel/files/extra-patch-global-names index 85d10136ce40..9b5ec3ce29e9 100644 --- a/lang/sml-nj-devel/files/extra-patch-global-names +++ b/lang/sml-nj-devel/files/extra-patch-global-names @@ -1,11 +1,11 @@ ---- src/runtime/include/asm-base.h-- Thu Aug 6 13:40:30 1998 -+++ src/runtime/include/asm-base.h Mon Feb 1 15:33:00 1999 +--- src/runtime/include/asm-base.h-- Fri Apr 20 18:56:45 2001 ++++ src/runtime/include/asm-base.h Thu Jun 14 12:49:34 2001 @@ -16,7 +16,7 @@ #define FALSE 0 #define TRUE 1 --#if (!defined(GLOBALS_HAVE_UNDERSCORE)) && (defined(OPSYS_SUNOS) || defined(OPSYS_FREEBSD) || defined(OPSYS_NETBSD) || defined(OPSYS_NEXTSTEP) || defined(OPSYS_WIN32)) -+#if (!defined(GLOBALS_HAVE_UNDERSCORE)) && (defined(OPSYS_SUNOS) || (defined(OPSYS_FREEBSD) && !defined(__ELF__)) || defined(OPSYS_NETBSD) || defined(OPSYS_NEXTSTEP) || defined(OPSYS_WIN32)) +-#if (!defined(GLOBALS_HAVE_UNDERSCORE)) && (defined(OPSYS_SUNOS) || defined(OPSYS_FREEBSD) || defined(OPSYS_NETBSD) || defined(OPSYS_NEXTSTEP) || defined(OPSYS_WIN32) || defined(OPSYS_DARWIN)) ++#if (!defined(GLOBALS_HAVE_UNDERSCORE)) && (defined(OPSYS_SUNOS) || (defined(OPSYS_FREEBSD) && !defined(__ELF__)) || defined(OPSYS_NETBSD) || defined(OPSYS_NEXTSTEP) || defined(OPSYS_WIN32) || defined(OPSYS_DARWIN)) # define GLOBALS_HAVE_UNDERSCORE #endif diff --git a/lang/sml-nj-devel/files/extra-patch-signals b/lang/sml-nj-devel/files/extra-patch-signals deleted file mode 100644 index 5546f0e4f7e8..000000000000 --- a/lang/sml-nj-devel/files/extra-patch-signals +++ /dev/null @@ -1,21 +0,0 @@ -*** src.old/runtime/mach-dep/signal-sysdep.h Sat Jan 22 18:15:21 2000 ---- src/runtime/mach-dep/signal-sysdep.h Sun Jan 23 01:46:53 2000 -*************** -*** 396,403 **** - # elif defined(OPSYS_FREEBSD) - /** x86, FreeBSD **/ - # define SIG_FAULT1 SIGFPE -! # define INT_DIVZERO(s, c) (((s) == SIGFPE) && ((c) == FPE_INTDIV_TRAP)) -! # define INT_OVFLW(s, c) (((s) == SIGFPE) && ((c) == FPE_INTOVF_TRAP)) - - # define SIG_GetCode(info, scp) (info) - # define SIG_GetPC(scp) ((scp)->sc_pc) ---- 396,403 ---- - # elif defined(OPSYS_FREEBSD) - /** x86, FreeBSD **/ - # define SIG_FAULT1 SIGFPE -! # define INT_DIVZERO(s, c) (((s) == SIGFPE) && ((c) == FPE_INTDIV)) -! # define INT_OVFLW(s, c) (((s) == SIGFPE) && ((c) == FPE_INTOVF)) - - # define SIG_GetCode(info, scp) (info) - # define SIG_GetPC(scp) ((scp)->sc_pc) diff --git a/lang/sml-nj-devel/files/patch-ab b/lang/sml-nj-devel/files/patch-ab index 6e9c75bb0469..cacfce583402 100644 --- a/lang/sml-nj-devel/files/patch-ab +++ b/lang/sml-nj-devel/files/patch-ab @@ -1,21 +1,39 @@ ---- 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 @@ - if [ "$?" != "0" ]; then - exit $? - fi -+# we need to patch just before build -+echo "applying source patches" -+patch_file="${FILESDIR}/extra-patch-global-names" -+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 -+ $PATCH $PATCH_ARGS < $patch_file +--- config/install.sh.orig Wed May 23 03:36:12 2001 ++++ config/install.sh Mon Jun 18 14:40:02 2001 +@@ -408,6 +408,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 -+fi - if [ ! -x $RUNDIR/run.$ARCH-$OPSYS ]; then - cd $SRCDIR/runtime/objs - echo "compiling the run-time system" ++ ++ 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 +@@ -519,6 +541,7 @@ + # build the run-time system + # + unpack "run-time" $SRCDIR runtime runtime ++do_patch extra-patch-global-names + if [ -x $RUNDIR/run.$ARCH-$OPSYS ]; then + echo $this: Run-time system already exists. + else diff --git a/lang/sml-nj-devel/files/targets.customized b/lang/sml-nj-devel/files/targets.customized new file mode 100644 index 000000000000..2857f74eca80 --- /dev/null +++ b/lang/sml-nj-devel/files/targets.customized @@ -0,0 +1,98 @@ +# targets +# +# the following is a list of the targets (in addition to sml) that +# this shell script can install. Comment out those that you do not +# want. Note that cml-lib requires cml. + +# +# But first, decide where you want to have stable libraries stored. +# If you set $MOVE_LIBRARIES to true, then the install script will +# move all libraries out of the source tree and into the $LIBDIR +# directory. Thus, you can then delete the entire source tree without +# losing functionality. So choose one of these two: + +MOVE_LIBRARIES=true +#MOVE_LIBRARIES=false + +# Now let's get started with the target list... + +TARGETS="" + +# (Always: build the basic sml compiler. This is not reflected in $TARGETS.) + + +# unpack the source code for the SML/NJ compiler; this is not required, +# unless you are doing compiler hacking, but it may be interesting to look at. +# +#TARGETS="$TARGETS src-smlnj" + +# build ML-Yacc +# +TARGETS="$TARGETS ml-yacc" + +# Always: install the pre-compiled ML-Yacc Library; this is necessary +# to use parsers produced by ML-Yacc, but also to bootstrap the system +# in the first place. + + +# build ML-Lex +# +TARGETS="$TARGETS ml-lex" + +# Always: install the pre-compiled SML/NJ Library (necessary to bootstrap). + + +# build ML-Burg +# +TARGETS="$TARGETS ml-burg" + +# pre-compile and install the remaining components of the SML/NJ library +# (everything except smlnj-lib.cm, aka Util, itself) +TARGETS="$TARGETS smlnj-lib" + +# pre-compile and install Concurrent ML, which is a library for message-passing +# concurrency. +# +#TARGETS="$TARGETS cml" + +# pre-compile and install the CML Library, which provides some useful CML +# modules. +# +#TARGETS="$TARGETS cml-lib" + +# pre-compile and install eXene, which is a library for X-Windows programming. +# EXene requires CML. +# +#TARGETS="$TARGETS eXene" + +# pre-compile and install the C-Kit, which is a library for parsing and +# type-checking C programs +# +TARGETS="$TARGETS ckit" + +# pre-compile and install the ML-NLFFI Library, which is the core of +# a new foreign function interface (where "foreign" functions are +# "no longer foreign") +# This library is necessary to compile and/or run programs that use +# the new FFI. +# This preview release currently works only under X86/Linux. +# +TARGETS="$TARGETS ml-nlffi-lib" + +# build ML-NLFFI-Gen, a program generator tool used in conjunction with +# the new "NLFFI" foreign function interface. The tool generates ML +# glue code from C source code. +# (Requires ckit!) +# This preview release currently works only under X86/Linux. +# +TARGETS="$TARGETS ml-nlffigen" + +# unpack and install the documentation directory. +# +#TARGETS="$TARGETS doc" + +# Note: autoloading is always enabled. +# In order to customize what is being pre-registered for autoloading +# edit file "preloads". You should make sure that it contains at least +# "$smlnj/cm.cm". +# Also, it is a good idea to have "$/basis.cm" pre-loaded. |