mono-2.4.2.3: Fix compilation issues.

* Disable parallel make, mono does not like it.
* Add a patch to get mono cross compile for x86 target.
* add mono_cv_sizeof_sunpath to site files, becasue
  previously it was called cv_mono_sizeof_sunpath

Signed-off-by: Khem Raj <raj.khem@gmail.com>

5 files changed, 34 insertions, 7 deletions

diff --git a/recipes/mono/mono_2.4.2.3.inc b/recipes/mono/mono-2.4.2.3.inc
index 21e596090c..2625703497 100644
--- a/recipes/mono/mono_2.4.2.3.inc
+++ b/recipes/mono/mono-2.4.2.3.inc
@@ -6,7 +6,11 @@ SRC_URI = "http://ftp.novell.com/pub/mono/sources/mono/mono-2.4.2.3.tar.bz2"
 
 INC_PR = "r3"
 
-S = "${WORKDIR}/mono-2.4.2.3"
+S = "${WORKDIR}/mono-${PV}"
+
+# parallel make does not work for mono (currently)
+
+PARALLEL_MAKE = ""
 
 do_fix_dolt_libtool() {
 	# look for libtool prefixed with HOST_SYS
diff --git a/recipes/mono/mono-2.4.2.3/mono-cross-compilation-for-amd64.patch b/recipes/mono/mono-2.4.2.3/mono-cross-compilation-for-amd64.patch
new file mode 100644
index 0000000000..e8d91da148
--- /dev/null
+++ b/recipes/mono/mono-2.4.2.3/mono-cross-compilation-for-amd64.patch
@@ -0,0 +1,23 @@
+This is a workaround for bug 515050
+https://bugzilla.novell.com/show_bug.cgi?id=515050#c2
+
+Real fix is something else which did not make into 2.4.2
+http://lists.ximian.com/pipermail/mono-patches/2009-June/151386.html
+http://lists.ximian.com/pipermail/mono-patches/2009-June/151387.html
+
+but we are ok with workaround its safe.
+
+-Khem
+Index: mono-2.4.2.3/mono/mini/genmdesc.pl
+===================================================================
+--- mono-2.4.2.3.orig/mono/mini/genmdesc.pl	2009-10-15 18:21:45.000000000 -0700
++++ mono-2.4.2.3/mono/mini/genmdesc.pl	2009-10-15 18:22:19.000000000 -0700
+@@ -47,7 +47,7 @@ sub load_opcodes
+ 		$arch_define = "TARGET_ARM";
+ 	}
+ 		
+-	$cpp .= " -D$arch_define $srcdir/mini-ops.h|";
++	$cpp .= " -DMONO_ARCH_SUPPORT_SIMD_INTRINSICS -D$arch_define $srcdir/mini-ops.h|";
+ 	#print "Running: $cpp\n";
+ 	open (OPS, $cpp) || die "Cannot execute cpp: $!";
+ 	while (<OPS>) {
diff --git a/recipes/mono/mono-mcs-intermediate_2.4.2.3.bb b/recipes/mono/mono-mcs-intermediate_2.4.2.3.bb
index 258f812602..92fc9f16d3 100644
--- a/recipes/mono/mono-mcs-intermediate_2.4.2.3.bb
+++ b/recipes/mono/mono-mcs-intermediate_2.4.2.3.bb
@@ -5,7 +5,7 @@
 # package in step 2.
 # See http://www.mono-project.com/Mono:ARM
 
-require mono_2.4.2.3.inc
+require mono-${PV}.inc
 require mono-mcs-intermediate.inc
 
 DEFAULT_PREFERENCE = "-1"
@@ -13,5 +13,3 @@ DEFAULT_PREFERENCE = "-1"
 SRC_URI += ""
 
 PR = "${INC_PR}.1"
-
-
diff --git a/recipes/mono/mono-native_2.4.2.3.bb b/recipes/mono/mono-native_2.4.2.3.bb
index 44ac053e99..7974e95fb8 100644
--- a/recipes/mono/mono-native_2.4.2.3.bb
+++ b/recipes/mono/mono-native_2.4.2.3.bb
@@ -1,4 +1,4 @@
-require mono_2.4.2.3.inc
+require mono-${PV}.inc
 DEPENDS = "glib-2.0-native perl-native"
 
 PR = "${INC_PR}.1"
diff --git a/recipes/mono/mono_2.4.2.3.bb b/recipes/mono/mono_2.4.2.3.bb
index e1f1968cdb..e18a4e7801 100644
--- a/recipes/mono/mono_2.4.2.3.bb
+++ b/recipes/mono/mono_2.4.2.3.bb
@@ -1,4 +1,4 @@
-require mono_2.4.2.3.inc
+require mono-${PV}.inc
 
 DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
 
@@ -11,7 +11,9 @@ ARM_INSTRUCTION_SET = "arm"
 
 SRC_URI += "file://configure.patch;patch=1\
 	    file://mini-arm.patch;patch=1\
-            file://0001-remove-docs-dir-from-build.patch;patch=1"
+            file://0001-remove-docs-dir-from-build.patch;patch=1 \
+            file://mono-cross-compilation-for-amd64.patch;patch=1 \
+           "
 
 # Per http://www.mono-project.com/Mono:ARM
 EXTRA_OECONF += " --disable-mcs-build "