[MLton-commit] r4651

[Matthew F. <fl...@ml...>]

*BSD patch is pretty verbose; be silent to limit noise
----------------------------------------------------------------------

U   mlton/branches/on-20050822-x86_64-branch/lib/ckit-lib/Makefile
U   mlton/branches/on-20050822-x86_64-branch/lib/mlrisc-lib/Makefile
U   mlton/branches/on-20050822-x86_64-branch/lib/smlnj-lib/Makefile
U   mlton/branches/on-20050822-x86_64-branch/runtime/Makefile
U   mlton/branches/on-20050822-x86_64-branch/runtime/gdtoa-patch

----------------------------------------------------------------------

Modified: mlton/branches/on-20050822-x86_64-branch/lib/ckit-lib/Makefile
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/lib/ckit-lib/Makefile	2006-06-13 02:32:23 UTC (rev 4650)
+++ mlton/branches/on-20050822-x86_64-branch/lib/ckit-lib/Makefile	2006-06-14 01:10:07 UTC (rev 4651)
@@ -13,7 +13,7 @@
 	gzip -dc ckit.tgz | tar xf -
 	chmod -R a+r ckit
 	chmod -R g-s ckit
-	patch -p0 < ckit.patch
+	patch -s -p0 < ckit.patch
 
 .PHONY: clean
 clean:

Modified: mlton/branches/on-20050822-x86_64-branch/lib/mlrisc-lib/Makefile
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/lib/mlrisc-lib/Makefile	2006-06-13 02:32:23 UTC (rev 4650)
+++ mlton/branches/on-20050822-x86_64-branch/lib/mlrisc-lib/Makefile	2006-06-14 01:10:07 UTC (rev 4651)
@@ -13,7 +13,7 @@
 	gzip -dc MLRISC.tgz | tar xf -
 	chmod -R a+r MLRISC
 	chmod -R g-s MLRISC
-	patch -p0 < MLRISC.patch
+	patch -c -p0 < MLRISC.patch
 
 .PHONY: clean
 clean:

Modified: mlton/branches/on-20050822-x86_64-branch/lib/smlnj-lib/Makefile
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/lib/smlnj-lib/Makefile	2006-06-13 02:32:23 UTC (rev 4650)
+++ mlton/branches/on-20050822-x86_64-branch/lib/smlnj-lib/Makefile	2006-06-14 01:10:07 UTC (rev 4651)
@@ -13,7 +13,7 @@
 	gzip -dc smlnj-lib.tgz | tar xf -
 	chmod -R a+r smlnj-lib
 	chmod -R g-s smlnj-lib
-	patch -p0 < smlnj-lib.patch
+	patch -s -p0 < smlnj-lib.patch
 	mv smlnj-lib/LICENSE ../../doc/license/SMLNJ-LIB-LICENSE
 
 .PHONY: clean

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/Makefile
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/Makefile	2006-06-13 02:32:23 UTC (rev 4650)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/Makefile	2006-06-14 01:10:07 UTC (rev 4651)
@@ -222,7 +222,7 @@
 
 gdtoa/arithchk.c:
 	gzip -dc gdtoa.tgz | tar xf -	
-	patch -p0 <gdtoa-patch
+	patch -s -p0 <gdtoa-patch
 
 gdtoa/arithchk.out: gdtoa/arithchk.c
 	cd gdtoa && $(CC) -o arithchk.out arithchk.c
@@ -341,7 +341,7 @@
 
 .PHONY: gdtoa-patch
 gdtoa-patch:
-	cd gdtoa && $(MAKE) clean && rm -f *~
+	cd gdtoa && $(MAKE) clean && rm -f *~ *.orig
 	mv gdtoa gdtoa-new
 	gzip -dc gdtoa.tgz | tar xf -
 	diff -P -C 2 -r gdtoa gdtoa-new >gdtoa-patch || exit 0

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/gdtoa-patch
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/gdtoa-patch	2006-06-13 02:32:23 UTC (rev 4650)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/gdtoa-patch	2006-06-14 01:10:07 UTC (rev 4651)
@@ -14,7 +14,6 @@
 ! int main()
   {
   	Akind *a = 0;
-Binary files gdtoa/arithchk.out and gdtoa-new/arithchk.out differ
 diff -P -C 2 -r gdtoa/dtoa.c gdtoa-new/dtoa.c
 *** gdtoa/dtoa.c	2000-11-02 07:09:01.000000000 -0800
 --- gdtoa-new/dtoa.c	2006-05-24 17:04:27.987435180 -0700