[Pkg-mono-svn-commits] [SCM] moon branch, master, updated. upstream/2.3-47-g8f32d36

[Jo Shields]

The following commit has been merged in the master branch:
commit 53055ec2b6ccb22753ecb47812be8ad88d982b9d
Author: Jo Shields <directhex at apebox.org>
Date:   Thu Nov 4 23:37:57 2010 +0000

    working packages! woo!
    (Historic bzr commit from Mon 2010-02-08 15:41:54 +0000)

diff --git a/debian/changelog b/debian/changelog
index a6cd806..30507ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ moon (2.0-0ubuntu1~pre~ppa1) UNRELEASED; urgency=low
     + Remove dpatch build-dep
     + We now only work on Mono arches, so use the list of Mono arches rather
       than Arch:any
+  * debian/patches/fix_mono_build_on_amd64_xen_r149671.patch:
+    + Backport from Mono Trunk to fix "Illegal Instruction" on AMD64 Xen
   * debian/control,
     debian/libmoonlight-*.install:
     + Create new packages for Moonlight system assemblies (e.g. for desktop
diff --git a/debian/patches/fix_mono_build_on_amd64_xen_r149671.patch b/debian/patches/fix_mono_build_on_amd64_xen_r149671.patch
new file mode 100644
index 0000000..f6dc6f4
--- /dev/null
+++ b/debian/patches/fix_mono_build_on_amd64_xen_r149671.patch
@@ -0,0 +1,28 @@
+Index: moonlight-2.0/mono-2-6/mono/mini/mini-amd64.c
+===================================================================
+--- moonlight-2.0.orig/mono-2-6/mono/mini/mini-amd64.c	2010-02-08 12:42:56.000000000 +0000
++++ moonlight-2.0/mono-2-6/mono/mini/mini-amd64.c	2010-02-08 12:43:14.000000000 +0000
+@@ -2558,11 +2558,6 @@
+ 			/* These methods are allocated using malloc */
+ 			near_call = FALSE;
+ 
+-		if (cfg->compile_aot) {
+-			near_call = TRUE;
+-			no_patch = TRUE;
+-		}
+-
+ #ifdef MONO_ARCH_NOMAP32BIT
+ 		near_call = FALSE;
+ #endif
+@@ -2571,6 +2566,11 @@
+ 		if (optimize_for_xen)
+ 			near_call = FALSE;
+ 
++		if (cfg->compile_aot) {
++			near_call = TRUE;
++			no_patch = TRUE;
++		}
++
+ 		if (near_call) {
+ 			/* 
+ 			 * Align the call displacement to an address divisible by 4 so it does
diff --git a/debian/patches/series b/debian/patches/series
index 9c1622a..7e119c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_monodoc_basefile.patch
 use_bundled_mono_runtime_for_smcs.patch
+fix_mono_build_on_amd64_xen_r149671.patch
diff --git a/debian/rules b/debian/rules
index c9a5e57..ae78419 100644
--- a/debian/rules
+++ b/debian/rules
@@ -123,6 +123,8 @@ get-orig-source:
 
 binary: install-stamp
 
+binary-arch: install-stamp
+
 override_dh_makeshlibs:
 	dh_makeshlibs
 	dh_makeshlibs -p libmoon -V'libmoon (>= $(VERSION)), libmoon (<< $(VERSION).)'

-- 
moon