mono: use monoburg from mono-native instead

* the original method is to build monoburg natively during the (crossed)
  mono build.  it will require glib-dev from host.  now we use the one
  from mono-native.
* mono-native 1.2.5.1 is updated to stage monoburg

diff --git a/packages/mono/mono-1.2.5.1/disable-monoburg.patch b/packages/mono/mono-1.2.5.1/disable-monoburg.patch
new file mode 100644 (file)
index 0000000..21c1e30
--- /dev/null
+++ b/packages/mono/mono-1.2.5.1/disable-monoburg.patch
@@ -0,0 +1,22 @@
+Index: mono-1.2.5.1/mono/Makefile.am
+===================================================================
+--- mono-1.2.5.1.orig/mono/Makefile.am 2008-03-05 15:52:06.000000000 +0800
++++ mono-1.2.5.1/mono/Makefile.am      2008-03-05 15:52:23.000000000 +0800
+@@ -1,3 +1,3 @@
+ 
+-SUBDIRS = utils io-layer monoburg os cil metadata \
++SUBDIRS = utils io-layer os cil metadata \
+       arch interpreter mini dis monograph tests benchmark profiler
+Index: mono-1.2.5.1/mono/mini/Makefile.am
+===================================================================
+--- mono-1.2.5.1.orig/mono/mini/Makefile.am    2008-03-05 16:02:51.000000000 +0800
++++ mono-1.2.5.1/mono/mini/Makefile.am 2008-03-05 16:02:57.000000000 +0800
+@@ -436,7 +436,7 @@
+       $(GENMDESC_PRG) $(srcdir)/cpu-mips.md cpu-mips.h mips_desc
+ 
+ inssel.c inssel.h: $(BURGSRC)
+-      $(monodir)/mono/monoburg/monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
++      monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
+ 
+ testi: mono test.exe
+       $(RUNTIME) -v -v --ncompile 1 --compile Test:$(mtest) test.exe

diff --git a/packages/mono/mono-native_1.2.5.1.bb b/packages/mono/mono-native_1.2.5.1.bb
index 7ac2246..8506a20 100644 (file)
--- a/packages/mono/mono-native_1.2.5.1.bb
+++ b/packages/mono/mono-native_1.2.5.1.bb
@@ -1,5 +1,5 @@
 require mono_1.2.5.inc
-PR = "r1"
+PR = "r2"
 DEPENDS = "glib-2.0-native perl-native"
 
 SRC_URI += "file://mono-fix-libdir-path.patch;patch=1"
@@ -8,9 +8,9 @@ PARALLEL_MAKE = ""
 
 inherit native
 
-#do_stage_prepend() {
-#      install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
-#}
+do_stage_prepend() {
+       install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
+}
 
 do_fix_libtool_name() {
        # inherit native will make that all native tools that are being

diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb
index 55f601b..d073aa7 100644 (file)
--- a/packages/mono/mono_1.2.5.1.bb
+++ b/packages/mono/mono_1.2.5.1.bb
@@ -2,10 +2,11 @@ require mono_1.2.5.inc
 
 DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://configure.patch;patch=1 \
-       file://genmdesc-cpp.patch;patch=1"
+       file://genmdesc-cpp.patch;patch=1 \
+       file://disable-monoburg.patch;patch=1"
 
 # Per http://www.mono-project.com/Mono:ARM
 EXTRA_OECONF += " --disable-mcs-build "