[Pkg-mono-svn-commits] rev 3563 - in mono/trunk/debian: . patches

[Mirco Bauer]

Author: meebey
Date: 2007-12-26 22:33:47 +0000 (Wed, 26 Dec 2007)
New Revision: 3563

Added:
   mono/trunk/debian/patches/ppc_disable_delegate_trampoline_optimization.dpatch
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/patches/00list
   mono/trunk/debian/rules
Log:
mono 1.2.6+dfsg-4 release



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2007-12-25 16:30:20 UTC (rev 3562)
+++ mono/trunk/debian/changelog	2007-12-26 22:33:47 UTC (rev 3563)
@@ -1,3 +1,14 @@
+mono (1.2.6+dfsg-4) unstable; urgency=low
+
+  * debian/patches/ppc_disable_delegate_trampoline_optimization.dpatch:
+    + Disables delegate trampoline code for PPC, fixes instant SIGILL runtime
+      crashes for every invoked application (as seen in PPC build logs of
+      gtk-sharp2, gnome-sharp2 or beagle).
+  * debian/rules:
+    + Make sure -j1 is passed to make, Mono's build system doesn't like -j > 1.
+
+ -- Mirco Bauer <meebey at debian.org>  Wed, 26 Dec 2007 23:29:28 +0100
+
 mono (1.2.6+dfsg-3) unstable; urgency=low
 
   * debian/rules:

Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list	2007-12-25 16:30:20 UTC (rev 3562)
+++ mono/trunk/debian/patches/00list	2007-12-26 22:33:47 UTC (rev 3563)
@@ -7,3 +7,4 @@
 fix_BigInteger_overflow_CVE-2007-5197
 fix_Mono.Cecil_linkage
 fix_implicit_pointer_conversions
+ppc_disable_delegate_trampoline_optimization

Added: mono/trunk/debian/patches/ppc_disable_delegate_trampoline_optimization.dpatch
===================================================================
--- mono/trunk/debian/patches/ppc_disable_delegate_trampoline_optimization.dpatch	                        (rev 0)
+++ mono/trunk/debian/patches/ppc_disable_delegate_trampoline_optimization.dpatch	2007-12-26 22:33:47 UTC (rev 3563)
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ppc_disable_delegate_trampoline_optimization.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-1.2.6~/mono/mini/mini-ppc.h mono-1.2.6/mono/mini/mini-ppc.h
+--- mono-1.2.6~/mono/mini/mini-ppc.h	2007-11-08 23:07:34.000000000 +0100
++++ mono-1.2.6/mono/mini/mini-ppc.h	2007-12-26 23:22:59.000000000 +0100
+@@ -109,7 +109,7 @@
+ 
+ #define MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE
+ #define MONO_ARCH_HAVE_CREATE_TRAMPOLINE_FROM_TOKEN
+-#define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE
++/* #define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE */
+ #define MONO_ARCH_HAVE_IMT 1
+ #define MONO_ARCH_IMT_REG ppc_r12
+ #define MONO_ARCH_COMMON_VTABLE_TRAMPOLINE 1
+diff -urNad mono-1.2.6~/mono/mini/tramp-ppc.c mono-1.2.6/mono/mini/tramp-ppc.c
+--- mono-1.2.6~/mono/mini/tramp-ppc.c	2007-11-08 23:07:34.000000000 +0100
++++ mono-1.2.6/mono/mini/tramp-ppc.c	2007-12-26 23:24:31.000000000 +0100
+@@ -261,8 +261,10 @@
+ 			tramp_handler = mono_aot_trampoline;
+ 		else if (tramp_type == MONO_TRAMPOLINE_AOT_PLT)
+ 			tramp_handler = mono_aot_plt_trampoline;
++#if defined(MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE)
+ 		else if (tramp_type == MONO_TRAMPOLINE_DELEGATE)
+ 			tramp_handler = mono_delegate_trampoline;
++#endif
+ 		else
+ 			tramp_handler = mono_magic_trampoline;
+ 		ppc_lis  (buf, ppc_r0, (guint32) tramp_handler >> 16);


Property changes on: mono/trunk/debian/patches/ppc_disable_delegate_trampoline_optimization.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2007-12-25 16:30:20 UTC (rev 3562)
+++ mono/trunk/debian/rules	2007-12-26 22:33:47 UTC (rev 3563)
@@ -16,6 +16,10 @@
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE  := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
+# Mono's build system doesn't like -j > 1
+MAKE_FLAGS += -j1
+export MAKEFLAGS=$(MAKE_FLAGS)
+
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	CONF_FLAGS += --build $(DEB_HOST_GNU_TYPE)
 else
@@ -79,10 +83,10 @@
 	$(CONFIGURE)
 	touch configure-indep-stamp
 
-build-arch: configure-arch build-arch-stamp
+build-arch: configure-arch-stamp build-arch-stamp
 build-arch-stamp: cli-wrapper
 	dh_testdir
-	LC_ALL=C $(MAKE) EXTERNAL_MCS=false EXTERNAL_MONO=false
+	LC_ALL=C $(MAKE) $(MAKE_FLAGS) EXTERNAL_MCS=false EXTERNAL_MONO=false
 	cd mcs/jay && \
 	  $(MAKE)
 	cd debian/detector && \
@@ -90,7 +94,7 @@
 	#debian/mono-aot-bootstrap
 	touch build-arch-stamp
 
-build-indep: configure-indep build-indep-stamp
+build-indep: configure-indep-stamp build-indep-stamp
 build-indep-stamp:
 	dh_testdir
 	LC_ALL=C $(MAKE) $(MAKE_FLAGS) EXTERNAL_MCS=false EXTERNAL_MONO=false
@@ -273,3 +277,4 @@
 	dh_builddeb -s
 
 .PHONY: clean build binary-indep binary-arch install binary patch unpatch
+.NOTPARALLEL: