[oe-commits] org.oe.dev mono: use monoburg from mono-native instead

[john_lee commit]

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

Author: john_lee at openembedded.org
Branch: org.openembedded.dev
Revision: 8cc76c81c6f8191804dc6c77ac7c6bdc07a6d38c
ViewMTN: http://monotone.openembedded.org/revision/info/8cc76c81c6f8191804dc6c77ac7c6bdc07a6d38c
Files:
1
packages/mono/mono-1.2.5.1/disable-monoburg.patch
packages/mono/mono-native_1.2.5.1.bb
packages/mono/mono_1.2.5.1.bb
Diffs:

#
# mt diff -r0d17ad29322334484f8cfa5e6b418887f5d33b2f -r8cc76c81c6f8191804dc6c77ac7c6bdc07a6d38c
#
#
#
# add_file "packages/mono/mono-1.2.5.1/disable-monoburg.patch"
#  content [dfe52ba84c77f75205b8b02c6140c27ef67a7709]
# 
# patch "packages/mono/mono-native_1.2.5.1.bb"
#  from [e463e56ce2e9dae0cd9780d8e21578fbe2c87ead]
#    to [8b7896804cad7ef3c1b4c10dbf0223ae1d8f67f0]
# 
# patch "packages/mono/mono_1.2.5.1.bb"
#  from [02c534f859b7637ca5aca1d0d851f0622b8e0ab2]
#    to [41d36ce7224102d48d7757b26c0ad42be6468b8b]
#
============================================================
--- packages/mono/mono-1.2.5.1/disable-monoburg.patch	dfe52ba84c77f75205b8b02c6140c27ef67a7709
+++ packages/mono/mono-1.2.5.1/disable-monoburg.patch	dfe52ba84c77f75205b8b02c6140c27ef67a7709
@@ -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
============================================================
--- packages/mono/mono-native_1.2.5.1.bb	e463e56ce2e9dae0cd9780d8e21578fbe2c87ead
+++ packages/mono/mono-native_1.2.5.1.bb	8b7896804cad7ef3c1b4c10dbf0223ae1d8f67f0
@@ -1,5 +1,5 @@ require mono_1.2.5.inc
 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 @@ inherit native
 
 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
============================================================
--- packages/mono/mono_1.2.5.1.bb	02c534f859b7637ca5aca1d0d851f0622b8e0ab2
+++ packages/mono/mono_1.2.5.1.bb	41d36ce7224102d48d7757b26c0ad42be6468b8b
@@ -2,10 +2,11 @@ DEPENDS = "mono-native mono-mcs-intermed
 
 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 "