1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
|
--- config/install.sh.orig 2014-08-22 15:20:03.000000000 +0200
+++ config/install.sh 2014-08-23 14:19:47.061124086 +0200
@@ -17,6 +17,8 @@
nolib=false
fi
+[ -n "$RECOMPILEDIR" ] && echo "RECOMPILEDIR=$RECOMPILEDIR"
+
if [ x${INSTALL_QUIETLY} = xtrue ] ; then
export CM_VERBOSE
CM_VERBOSE=false
@@ -37,6 +39,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
@@ -96,7 +120,28 @@
# Especially important is CM_PATHCONFIG.
#
export CM_PATHCONFIG
-CM_PATHCONFIG=$LIBDIR/pathconfig
+if [ -n "$STAGEDIR" -a -n "$MLLIB" ]
+then
+ # The final CM_PATHCONFIG file should not yet exist during
+ # staging, but still it has to be set in the environment when
+ # creating the (final) compiler heap. This way it becomes the
+ # the default pathconfig for the (final) heap.
+ # Therefore we will use the secondary pathconfig environment
+ # variable CM_LOCAL_PATHCONFIG to point to the (existing;)
+ # pathconfig in ROOT. This enables $smlnj/installer.cm
+ # to operate within STAGEDIR (using the final heap) below.
+ CM_PATHCONFIG=$MLLIB/pathconfig
+ if [ -r $CM_PATHCONFIG ]
+ then
+ vsay "$this: !!! Staging conflicts with an existing installation!"
+ complain "$this: !!! Make $CM_PATHCONFIG unreadable and try again!"
+ fi
+ CM_PATHCONFIG_STAGE=$STAGEDIR$CM_PATHCONFIG
+ CM_LOCAL_PATHCONFIG=$CM_PATHCONFIG_STAGE
+else
+ CM_PATHCONFIG=$LIBDIR/pathconfig
+ CM_PATHCONFIG_STAGE=$CM_PATHCONFIG
+fi
#
# the release version that we are installing
#
@@ -326,7 +371,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
@@ -335,9 +385,15 @@
vsay $this: Run-time system already exists.
else
"$CONFIGDIR"/unpack "$ROOT" runtime
+ [ -n "$MLRUNTIMEPATCHES" ] && \
+ for p in $MLRUNTIMEPATCHES
+ do
+ do_patch $p
+ done
cd "$BASEDIR"/runtime/objs
echo $this: Compiling the run-time system.
- $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
+ echo "$MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS AS=\""$AS\"" CFLAGS=\"$CFLAGS\""
+ $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS AS="$AS" CFLAGS="$CFLAGS"
if [ -x run.$ARCH-$OPSYS ]; then
mv run.$ARCH-$OPSYS "$RUNDIR"
if [ -f runx.$ARCH-$OPSYS ]; then
@@ -349,7 +405,7 @@
if [ -f run.$ARCH-$OPSYS.a ]; then
mv run.$ARCH-$OPSYS.a "$RUNDIR"
fi
- $MAKE MAKE=$MAKE clean
+ [ "$MLNORUNTIMECLEAN" ] || $MAKE MAKE=$MAKE clean
else
complain "$this: !!! Run-time system build failed for some reason."
fi
@@ -375,7 +431,7 @@
complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."
fi
else
- "$CONFIGDIR"/unpack "$ROOT" "$BOOT_ARCHIVE"
+ [ -n "$RECOMPILEDIR" ] || "$CONFIGDIR"/unpack "$ROOT" "$BOOT_ARCHIVE"
fish "$ROOT"/"$BOOT_FILES"/smlnj/basis
@@ -410,7 +466,7 @@
cd "$ROOT"/"$BOOT_FILES"
for anchor in * ; do
if [ -d $anchor ] ; then
- echo $anchor $anchor >>$CM_PATHCONFIG
+ echo $anchor $anchor >>$CM_PATHCONFIG_STAGE
move $anchor "$LIBDIR"/$anchor
fi
done
@@ -433,6 +489,18 @@
cd "$ROOT"
+# apply source patches for standard targets
+[ -n "$MLSTANDARDPATCHDIRS" ] && \
+for d in $MLSTANDARDPATCHDIRS
+do
+ "$CONFIGDIR"/unpack "$ROOT" "$d"
+done
+[ -n "$MLSTANDARDPATCHES" ] && \
+for p in $MLSTANDARDPATCHES
+do
+ do_patch $p
+done
+
#
# Now do all the rest using the precompiled installer
# (see base/system/smlnj/installer for details)
@@ -442,6 +510,12 @@
export ROOT INSTALLDIR CONFIGDIR BINDIR
CM_TOLERATE_TOOL_FAILURES=true
export CM_TOLERATE_TOOL_FAILURES
+ # smlnj/installer/nix-install.sml (re)sets CM_LOCAL_PATHCONFIG
+ # to /dev/null in the buildcmd that it uses to invoke the builds.
+ # So the build process needs a working CM_PATHCONFIG. This is NOT
+ # propagated to the resulting heaps because the heaps generated
+ # in this stage don't contain the compiler.
+ [ -z "$STAGEDIR" ] || CM_PATHCONFIG=$CM_LOCAL_PATHCONFIG
if "$BINDIR"/sml -m \$smlnj/installer.cm
then
vsay $this: Installation complete.
@@ -450,4 +524,19 @@
fi
fi
+# Finish staging by removing the $STAGEDIR prefix from the driver scripts.
+if [ -n "$STAGEDIR" ]
+then
+ find $BINDIR -type f -perm -1 | \
+ xargs fgrep -l "$STAGEDIR" | \
+ xargs sed -i "" -e 's%'"$STAGEDIR"'%%g'
+fi
+
+# apply all source patches
+[ -n "$MLSOURCEPATCHES" ] && \
+for p in $MLSOURCEPATCHES
+do
+ do_patch $p
+done
+
exit 0
|
