summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJohn Lee <john_lee@openmoko.org>2008-03-05 08:34:05 +0000
committerJohn Lee <john_lee@openmoko.org>2008-03-05 08:34:05 +0000
commit46eed3d80df4a535a333813f54cae6a251287bca (patch)
treed98a8fd9602552838970c67a6dac0db633996333 /packages
parent030bd3d6cbce2c7592c0ba1090230a37198ba5cb (diff)
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
Diffstat (limited to 'packages')
-rw-r--r--packages/mono/mono-1.2.5.1/disable-monoburg.patch22
-rw-r--r--packages/mono/mono-native_1.2.5.1.bb8
-rw-r--r--packages/mono/mono_1.2.5.1.bb5
3 files changed, 29 insertions, 6 deletions
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
index 0000000000..21c1e30f07
--- /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 7ac2246b3a..8506a20867 100644
--- 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 55f601bcb7..d073aa7d98 100644
--- 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 "