mono: update to 1.2.4

7 files changed, 132 insertions, 0 deletions

diff --git a/packages/mono/files/mono-configure.patch b/packages/mono/files/mono-configure.patch
new file mode 100644
index 0000000000..6baa39aa1a
--- /dev/null
+++ b/packages/mono/files/mono-configure.patch
@@ -0,0 +1,32 @@
+--- mono-1.2.3.50.20070416.orig/configure.in	2007-04-16 07:02:59.000000000 +0200
++++ mono-1.2.3.50.20070416/configure.in	2007-04-16 18:36:00.000000000 +0200
+@@ -806,7 +806,9 @@ if test x$platform_win32 = xno; then
+ 			large_offt=yes
+ 		], [
+ 			AC_MSG_RESULT(no)
+-		], "")
++		], [
++			AC_MSG_RESULT(no)
++		])
+ 		CPPFLAGS=$large_CPPFLAGS
+ 	])
+ 
+@@ -1131,6 +1133,8 @@ if test x$platform_win32 = xno; then
+ 		], [
+ 				AC_MSG_RESULT(no)
+ 				with_tls=pthread
++		], [
++				AC_MSG_RESULT(yes)
+ 		])
+ 	fi
+ 
+@@ -1233,6 +1237,9 @@ if test x$platform_win32 = xno; then
+ 		], [
+ 				with_sigaltstack=no
+ 				AC_MSG_RESULT(no)
++		], [
++				AC_MSG_RESULT(yes)
++				AC_DEFINE(HAVE_WORKING_SIGALTSTACK)
+ 		])
+ 	fi
+ 
diff --git a/packages/mono/files/mono-mini-Makefile.patch b/packages/mono/files/mono-mini-Makefile.patch
new file mode 100644
index 0000000000..92399e8241
--- /dev/null
+++ b/packages/mono/files/mono-mini-Makefile.patch
@@ -0,0 +1,11 @@
+--- mono-1.2.3.20070219.orig/mono/mini/Makefile.am	2007-02-20 01:21:57.000000000 +0100
++++ mono-1.2.3.20070219/mono/mini/Makefile.am	2007-02-20 01:22:45.000000000 +0100
+@@ -409,7 +409,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/files/mono-mips-endian.patch b/packages/mono/files/mono-mips-endian.patch
new file mode 100644
index 0000000000..c0f1d3c759
--- /dev/null
+++ b/packages/mono/files/mono-mips-endian.patch
@@ -0,0 +1,28 @@
+--- mono-1.2.20070131/mono/mini/mini-mips.c	2007-01-31 07:00:22.000000000 +0100
++++ mono-1.2.20070131.mod/mono/mini/mini-mips.c	2007-02-17 21:22:34.000000000 +0100
+@@ -238,6 +238,11 @@
+ patch_lui_addiu(guint32 *ip, guint32 val)
+ {
+ 	guint16 *__lui_addiu = (guint16*)(void *)(ip);
++#if G_BYTE_ORDER == G_BIG_ENDIAN
++ 	int index=1;
++#else
++	int index=0;
++#endif
+ 
+ #if 0
+ 	printf ("patch_lui_addiu ip=0x%08x (0x%08x, 0x%08x) to point to 0x%08x\n",
+@@ -245,10 +250,10 @@
+ 	fflush (stdout);
+ #endif
+ 	if (((guint32)(val)) & (1 << 15))
+-		__lui_addiu [1] = ((((guint32)(val)) >> 16) & 0xffff) + 1;
++		__lui_addiu [index] = ((((guint32)(val)) >> 16) & 0xffff) + 1;
+ 	else
+-		__lui_addiu [1] = (((guint32)(val)) >> 16) & 0xffff;
+-	__lui_addiu [3] = ((guint32)(val)) & 0xffff;
++		__lui_addiu [index] = (((guint32)(val)) >> 16) & 0xffff;
++	__lui_addiu [index+2] = ((guint32)(val)) & 0xffff;
+ 	mono_arch_flush_icache ((guint8 *)ip, 8);
+ }
+ 
diff --git a/packages/mono/files/mono-monoburg-Makefile.patch b/packages/mono/files/mono-monoburg-Makefile.patch
new file mode 100644
index 0000000000..03f51c4b36
--- /dev/null
+++ b/packages/mono/files/mono-monoburg-Makefile.patch
@@ -0,0 +1,21 @@
+--- mono-1.2.20070131/mono/monoburg/Makefile.am	2006-10-10 07:00:26.000000000 +0200
++++ mono-1.2.20070131.mod/mono/monoburg/Makefile.am	2007-02-13 17:44:02.000000000 +0100
+@@ -1,5 +1,3 @@
+-CC=$(CC_FOR_BUILD)
+-
+ am_CFLAGS = $(BUILD_GLIB_CFLAGS) -I$(srcdir) $(CFLAGS_FOR_BUILD)
+ 
+ #noinst_PROGRAMS = sample
+@@ -12,10 +10,10 @@
+ 	bison $(srcdir)/monoburg.y -o parser.c
+ 
+ monoburg$(BUILD_EXEEXT): $(srcdir)/monoburg.c $(srcdir)/monoburg.h parser.c
+-	$(CC_FOR_BUILD) -o $@ $(srcdir)/monoburg.c parser.c $(am_CFLAGS) $(LDFLAGS) $(BUILD_GLIB_LIBS)
++	$(CC) -o $@ $(srcdir)/monoburg.c parser.c $(am_CFLAGS) $(LDFLAGS) $(BUILD_GLIB_LIBS)
+ 
+ sample.c: monoburg$(BUILD_EXEEXT) $(srcdir)/sample.brg
+-	./monoburg$(BUILD_EXEEXT) $(srcdir)/sample.brg > sample.c
++	monoburg$(BUILD_EXEEXT) $(srcdir)/sample.brg > sample.c
+ 
+ #sample_LDADD = $(BUILD_GLIB_LIBS)
+ 
diff --git a/packages/mono/mono-native_1.2.4.bb b/packages/mono/mono-native_1.2.4.bb
new file mode 100644
index 0000000000..b8d65ea85a
--- /dev/null
+++ b/packages/mono/mono-native_1.2.4.bb
@@ -0,0 +1,9 @@
+require mono4.inc
+PR = "r2"
+DEPENDS = "glib-2.0-native"
+
+inherit native
+
+do_stage_prepend() {
+	install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
+}
diff --git a/packages/mono/mono_1.2.4.bb b/packages/mono/mono_1.2.4.bb
new file mode 100644
index 0000000000..904c53cbd4
--- /dev/null
+++ b/packages/mono/mono_1.2.4.bb
@@ -0,0 +1,19 @@
+require mono4.inc
+DEPENDS = "mono-native glib-2.0"
+
+PR = "r3"
+SRC_URI += "file://mono-monoburg-Makefile.patch;patch=1 \
+	    file://mono-mips-endian.patch;patch=1 \
+	    file://mono-configure.patch;patch=1 \
+	    file://mono-mini-Makefile.patch;patch=1 \
+	    "
+
+do_install_append() {
+	install -d ${D}${libdir}/mono/1.0/
+	cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/
+}
+
+PACKAGES =+ "mono-dll"
+FILES_mono-dll = "${libdir}/mono/1.0/"
+
+
diff --git a/packages/mono/mono_1.2.4.inc b/packages/mono/mono_1.2.4.inc
new file mode 100644
index 0000000000..b9a721150f
--- /dev/null
+++ b/packages/mono/mono_1.2.4.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "Mono Programming Language"
+SECTION = "devel/mono"
+LICENSE = "GPL LGPL X11"
+
+SRC_URI = "http://go-mono.com/sources/mono/mono-${PV}.tar.bz2"
+
+S = "${WORKDIR}/mono-${PV}"
+
+inherit autotools
+EXTRA_OECONF = "--disable-mcs-build"
+EXTRA_OECONF_arm = "--without-tls"
+EXTRA_OECONF_mipsel = "--without-tls"