[Pkg-mono-svn-commits] rev 1629 - mono/branches/1.1/debian/patches

[Mirco Bauer]

Author: meebey-guest
Date: 2005-04-16 17:29:52 +0000 (Sat, 16 Apr 2005)
New Revision: 1629

Added:
   mono/branches/1.1/debian/patches/01_fix-mono-calls.dpatch
   mono/branches/1.1/debian/patches/06_monodis_mono_path.dpatch
Log:
- old patches.



Added: mono/branches/1.1/debian/patches/01_fix-mono-calls.dpatch
===================================================================
--- mono/branches/1.1/debian/patches/01_fix-mono-calls.dpatch	2005-04-16 15:23:10 UTC (rev 1628)
+++ mono/branches/1.1/debian/patches/01_fix-mono-calls.dpatch	2005-04-16 17:29:52 UTC (rev 1629)
@@ -0,0 +1,65 @@
+#! /bin/sh -e
+## 01_fix-mono-calls.dpatch by Michael Schiansky <ms@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix all cli/mono calls (See: #265521)
+## DP: thanks to: Dave Beckett <dave.beckett@bristol.ac.uk>
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/ms/uprojects/pkg/mono/build/1.0.2/mcs/mcs-1.0.2/gmcs/Makefile mcs-1.0.2/gmcs/Makefile
+--- /home/ms/uprojects/pkg/mono/build/1.0.2/mcs/mcs-1.0.2/gmcs/Makefile	2004-06-16 19:13:41.000000000 +0200
++++ mcs-1.0.2/gmcs/Makefile	2004-09-24 17:47:42.000000000 +0200
+@@ -69,7 +69,7 @@
+ dist-local: dist-default
+ 
+ gmcs.exe: $(all_sources)
+-	MONO_PATH="../class/lib/net_2_0_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" mono ../mcs/mcs.exe $(DEBUG_FLAGS) -2 /target:exe /debug /out:$@ $^
++	MONO_PATH="../class/lib/net_2_0_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) ../mcs/mcs.exe $(DEBUG_FLAGS) -2 /target:exe /debug /out:$@ $^
+ 
+ gmcs2.exe: $(all_sources)
+ 	MONO_PATH="../class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" time mcs -2 /target:exe /debug /out:$@ $^ $(DEBUG_FLAGS) 
+@@ -110,12 +110,12 @@
+ 	@ $(FRIENDLY_TIME) $(RUNTIME) ./mcs2.exe $(USE_MCS_FLAGS) /target:exe /out:mcs3.exe $(all_sources) > /dev/null || (echo FAILED; exit 1)
+ 	@ echo -n "corlib:  "
+ 	@ rm -f ../class/lib/mscorlib.dll
+-	@ (cd ../class/corlib ; make BOOTSTRAP_MCS="$(FRIENDLY_TIME) mono ../../mcs/mcs.exe" > /dev/null ) || (echo FAILED; exit 1)
++	@ (cd ../class/corlib ; make BOOTSTRAP_MCS="$(FRIENDLY_TIME) $(RUNTIME) ../../mcs/mcs.exe" > /dev/null ) || (echo FAILED; exit 1)
+ 
+ do-corlib:
+ 	@ echo -n "corlib:  "
+ 	@ rm -f ../class/lib/mscorlib.dll
+-	@ (cd ../class/corlib ; make BOOTSTRAP_MCS="$(FRIENDLY_TIME) mono ../../mcs/mcs.exe" > /dev/null ) || (echo FAILED; exit 1)
++	@ (cd ../class/corlib ; make BOOTSTRAP_MCS="$(FRIENDLY_TIME) $(RUNTIME) ../../mcs/mcs.exe" > /dev/null ) || (echo FAILED; exit 1)
+ 
+ PROFILER=default
+ 
+diff -urNad /home/ms/uprojects/pkg/mono/build/1.0.2/mcs/mcs-1.0.2/mcs/Makefile mcs-1.0.2/mcs/Makefile
+--- /home/ms/uprojects/pkg/mono/build/1.0.2/mcs/mcs-1.0.2/mcs/Makefile	2004-05-24 12:37:00.000000000 +0200
++++ mcs-1.0.2/mcs/Makefile	2004-09-24 17:47:36.000000000 +0200
+@@ -62,7 +62,7 @@
+ do-corlib:
+ 	@ echo -n "corlib:  "
+ 	@ rm -f ../class/lib/mscorlib.dll
+-	@ cd ../class/corlib ; $(MAKE) BOOTSTRAP_MCS="$(FRIENDLY_TIME) mono ../../mcs/mcs.exe" > /dev/null || (echo FAILED; exit 1)
++	@ cd ../class/corlib ; $(MAKE) BOOTSTRAP_MCS="$(FRIENDLY_TIME) $(RUNTIME) ../../mcs/mcs.exe" > /dev/null || (echo FAILED; exit 1)
+ 
+ PROFILER=default
+ 


Property changes on: mono/branches/1.1/debian/patches/01_fix-mono-calls.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: mono/branches/1.1/debian/patches/06_monodis_mono_path.dpatch
===================================================================
--- mono/branches/1.1/debian/patches/06_monodis_mono_path.dpatch	2005-04-16 15:23:10 UTC (rev 1628)
+++ mono/branches/1.1/debian/patches/06_monodis_mono_path.dpatch	2005-04-16 17:29:52 UTC (rev 1629)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_monodis_mono_path.dpatch by Mirco Bauer <meebey@meebey.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad mono-1.1.6/mono/dis/main.c /tmp/dpep.zfxOqo/mono-1.1.6/mono/dis/main.c
+--- mono-1.1.6/mono/dis/main.c	2005-03-30 23:26:14.000000000 +0200
++++ /tmp/dpep.zfxOqo/mono-1.1.6/mono/dis/main.c	2005-04-16 01:07:11.765685528 +0200
+@@ -1622,6 +1622,11 @@
+ 		usage ();
+ 
+ 	/*
++	 * this is required for abusing monodis to load assemblies references which are not in the GAC
++	 */
++	check_path_env();
++	
++	/*
+ 	 * If we just have one file, use the corlib version it requires.
+ 	 */
+ 	if (!input_files->next) {


Property changes on: mono/branches/1.1/debian/patches/06_monodis_mono_path.dpatch
___________________________________________________________________
Name: svn:executable
   + *