head	1.7;
access;
symbols
	RELEASE_8_3_0:1.7
	RELEASE_9_0_0:1.7
	RELEASE_7_4_0:1.7
	RELEASE_8_2_0:1.7
	RELEASE_6_EOL:1.7
	RELEASE_8_1_0:1.7
	RELEASE_7_3_0:1.7
	RELEASE_8_0_0:1.7
	RELEASE_7_2_0:1.7
	RELEASE_7_1_0:1.7
	RELEASE_6_4_0:1.7
	RELEASE_5_EOL:1.7
	RELEASE_7_0_0:1.7
	RELEASE_6_3_0:1.7
	PRE_XORG_7:1.7
	RELEASE_4_EOL:1.7
	RELEASE_6_2_0:1.7
	RELEASE_6_1_0:1.7
	RELEASE_5_5_0:1.7
	RELEASE_6_0_0:1.7
	RELEASE_5_4_0:1.7
	RELEASE_4_11_0:1.7
	RELEASE_5_3_0:1.6
	RELEASE_4_10_0:1.6
	RELEASE_5_2_1:1.6
	RELEASE_5_2_0:1.6
	RELEASE_4_9_0:1.6
	RELEASE_5_1_0:1.5
	RELEASE_4_8_0:1.4
	RELEASE_5_0_0:1.4
	RELEASE_4_7_0:1.4
	RELEASE_4_6_2:1.4
	RELEASE_4_6_1:1.4
	RELEASE_4_6_0:1.4
	RELEASE_5_0_DP1:1.4
	RELEASE_4_5_0:1.4
	RELEASE_4_4_0:1.4
	RELEASE_4_3_0:1.4
	RELEASE_4_2_0:1.4
	RELEASE_4_1_1:1.3
	RELEASE_4_1_0:1.3
	RELEASE_3_5_0:1.3
	RELEASE_4_0_0:1.3
	RELEASE_3_4_0:1.2
	RELEASE_3_3_0:1.2
	RELEASE_3_2_0:1.2
	RELEASE_3_1_0:1.2;
locks; strict;
comment	@# @;


1.7
date	2004.12.31.07.51.03;	author jkoshy;	state Exp;
branches;
next	1.6;

1.6
date	2003.08.15.07.24.45;	author jkoshy;	state Exp;
branches;
next	1.5;

1.5
date	2003.03.30.00.36.22;	author jkoshy;	state Exp;
branches;
next	1.4;

1.4
date	2000.10.07.22.28.28;	author asami;	state Exp;
branches;
next	1.3;

1.3
date	2000.01.28.06.36.13;	author jkoshy;	state Exp;
branches;
next	1.2;

1.2
date	99.02.02.07.29.00;	author jkoshy;	state Exp;
branches;
next	1.1;

1.1
date	99.02.02.04.00.12;	author jkoshy;	state Exp;
branches;
next	;


desc
@@


1.7
log
@Use "install.sh" during build and also during install as done in
lang/sml-nj-devel to resolve PR 40866.

Submitted by:	Johannes 5 Joemann <joemann@@beefree.free.de>
@
text
@--- config/install.sh.orig	Fri Oct 20 18:02:25 2000
+++ config/install.sh	Tue Dec 21 06:22:34 2004
@@@@ -151,11 +151,34 @@@@
 #
 # build the run-time system
 #
+if [ -x $RUNDIR/run.$ARCH-$OPSYS ]; then
+  echo "$RUNDIR/run.$ARCH-$OPSYS already exists"
+else
 $CONFIGDIR/unpack.sh "run-time" $SRCDIR runtime $ROOT/runtime.tar
 if [ "$?" != "0" ]; then
   exit $?
 fi
-if [ ! -x $RUNDIR/run.$ARCH-$OPSYS ]; then
+# 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
+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
+		$PATCH $PATCH_ARGS < $patch_file
+	fi
+fi
+#if [ ! -x $RUNDIR/run.$ARCH-$OPSYS ]; then
   cd $SRCDIR/runtime/objs
   echo "compiling the run-time system"
   $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
@


1.6
log
@Fix build breakage with the GCC 3.3.1.

Submitted by:	Johannes 5 Joemann <joemann@@beefree.free.de>
@
text
@d1 10
a10 3
--- config/install.sh.orig	Fri Oct 20 16:02:25 2000
+++ config/install.sh	Tue Mar 11 22:30:59 2003
@@@@ -155,6 +155,26 @@@@
d14 1
d35 1
a35 1
 if [ ! -x $RUNDIR/run.$ARCH-$OPSYS ]; then
d38 1
@


1.5
log
@Make this port build on 5-CURRENT.
@
text
@d3 1
a3 1
@@@@ -155,6 +155,22 @@@@
d9 4
@


1.4
log
@Rename ${FILISDER}/patch-* to ${FILESDIRA}/extra-patch-*.  (These patches
are applied from within the configure script, patched by patch-ab.)
@
text
@d1 3
a3 3
--- 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 @@@@
d10 4
@


1.3
log
@Fix building of SML/NJ under 4-CURRENT after 1999/7/25.

The trap handler returns different information after this date for
numeric error conditions.  Since kern.osreldate is not a reliable
indicator of when this change occurred, we revert to checking for
the presence of a particular #define in <machine/trap.h> to decide
if the SML/NJ runtime sources need to use the newer interface.

Submitted by:	 Tom <tcrimi@@andrew.cmu.edu> (in part)
@
text
@d9 1
a9 1
+patch_file="${FILESDIR}/patch-global-names"
d14 1
a14 1
+	patch_file="${FILESDIR}/patch-signals"
@


1.2
log
@Correct stale patch.

Found by:	asami@@freebsd.org
@
text
@d2 2
a3 2
+++ config/install.sh	Tue Feb  2 12:57:13 1999
@@@@ -181,6 +181,12 @@@@
d8 1
a10 1
+	echo "applying source patches"
d12 6
@


1.1
log
@Add patch for ELF support.
@
text
@d1 5
a5 5
--- config/install.sh--	Wed Aug  5 13:43:43 1998
+++ config/install.sh	Mon Feb  1 15:57:31 1999
@@@@ -193,6 +193,12 @@@@
     exit 1
   fi
d13 3
a15 3
 cd $SRCDIR
 
 #
@

