summaryrefslogtreecommitdiff
path: root/mono
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
committerChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
commitf96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch)
treeedb17ec2c4ea13c5acb1c7350957a249a820e28d /mono
parentb6588aa6851fb220cedc387d21c51513ef8d67f4 (diff)
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'mono')
-rw-r--r--mono/install-lossage.patch13
-rw-r--r--mono/libtool-lossage.patch7
2 files changed, 20 insertions, 0 deletions
diff --git a/mono/install-lossage.patch b/mono/install-lossage.patch
index e69de29bb2..51fcdbbe85 100644
--- a/mono/install-lossage.patch
+++ b/mono/install-lossage.patch
@@ -0,0 +1,13 @@
+--- mono-1.0/runtime/net_1_1/Makefile.am.old 2004-07-21 20:30:21.101405400 +0100
++++ mono-1.0/runtime/net_1_1/Makefile.am 2004-07-21 20:31:05.209699920 +0100
+@@ -91,8 +91,8 @@
+ @if test -n '$(gac_assemblies)'; then \
+ for i in ''$(gac_assemblies); do \
+ echo "MONO_PATH=$(srcdir) $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR)" ; \
+- MONO_PATH=$(srcdir) \
+- $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || exit 1 ; \
++ cd $(srcdir); MONO_PATH=$(srcdir) \
++ $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || exit 1 ; \
+ done; fi
+
+ uninstall-local:
diff --git a/mono/libtool-lossage.patch b/mono/libtool-lossage.patch
index e69de29bb2..ac6f0f801f 100644
--- a/mono/libtool-lossage.patch
+++ b/mono/libtool-lossage.patch
@@ -0,0 +1,7 @@
+--- mono-1.0/libgc/acinclude.m4.old 2004-07-21 19:10:53.059455128 +0100
++++ mono-1.0/libgc/acinclude.m4 2004-07-21 19:10:56.881874032 +0100
+@@ -46,4 +46,3 @@
+ ${GC_ALPHA_VERSION:+alpha=}$GC_ALPHA_VERSION)
+ ])
+
+-sinclude(libtool.m4)