[ptxdist] [PATCH 3/4] mono: version bump 2.10.1 -> 3.2.6

[Robert Schwebel <r.schwebel@pengutronix.de>]

The patch 0001-Fix-sgen-build-on-PPC-linux.patch is not necessary any
more, as the configure scripts do the PowerPC detection differently.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 .../0001-Fix-sgen-build-on-PPC-linux.patch         | 28 ----------
 patches/mono-2.10.1/series                         |  3 --
 rules/mono.make                                    | 61 ++++++++++++++++------
 3 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 patches/mono-2.10.1/0001-Fix-sgen-build-on-PPC-linux.patch
 delete mode 100644 patches/mono-2.10.1/series

diff --git a/patches/mono-2.10.1/0001-Fix-sgen-build-on-PPC-linux.patch b/patches/mono-2.10.1/0001-Fix-sgen-build-on-PPC-linux.patch
deleted file mode 100644
index 01d45d7..0000000
--- a/patches/mono-2.10.1/0001-Fix-sgen-build-on-PPC-linux.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 20 Apr 2011 09:19:50 +0200
-Subject: [PATCH] Fix sgen build on PPC linux.
-
-This is part of the upstream commit 4a812850f8af461619530dfd7c6e7f4531fdcf8d
-from Zoltan Varga <vargaz@gmail.com>
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- mono/metadata/sgen-archdep.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/mono/metadata/sgen-archdep.h b/mono/metadata/sgen-archdep.h
-index a1e3e6d..cde4ef5 100644
---- a/mono/metadata/sgen-archdep.h
-+++ b/mono/metadata/sgen-archdep.h
-@@ -102,7 +102,7 @@
- 	((a)[14] = (gpointer) (UCONTEXT_REG_R15 (ctx)));	\
- 	} while (0)
- 
--#elif defined(__ppc__)
-+#elif defined(__ppc__) || defined(__powerpc__) || defined(__powerpc64__)
- 
- #define REDZONE_SIZE	224
- 
--- 
-1.7.4.1
-
diff --git a/patches/mono-2.10.1/series b/patches/mono-2.10.1/series
deleted file mode 100644
index 1e99997..0000000
--- a/patches/mono-2.10.1/series
+++ /dev/null
@@ -1,3 +0,0 @@
-# generated by git-ptx-patches
-0001-Fix-sgen-build-on-PPC-linux.patch
-# 0986299811d2f60314c4897bb298f9af  - git-ptx-patches magic
diff --git a/rules/mono.make b/rules/mono.make
index 87265de..d8d4099 100644
--- a/rules/mono.make
+++ b/rules/mono.make
@@ -18,8 +18,8 @@ endif
 #
 # Paths and names
 #
-MONO_VERSION	:= 2.10.1
-MONO_MD5	:= ae8d1875447527599e68dd6c1d82bc11
+MONO_VERSION	:= 3.2.6
+MONO_MD5	:= 076e815090f9807f273b06a98e76e274
 MONO		:= mono-$(MONO_VERSION)
 MONO_SUFFIX	:= tar.bz2
 MONO_URL	:= http://download.mono-project.com/sources/mono/$(MONO).$(MONO_SUFFIX)
@@ -29,6 +29,19 @@ MONO_LICENSE	:= unknown
 MONO_DEVPKG	:= NO
 
 # ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/mono.extract:
+	@$(call targetinfo)
+	@$(call clean, $(MONO_DIR))
+	@$(call extract, MONO)
+#	# The mono archive has some stray .git files in it's externals-subdirs
+	@find $(MONO_DIR) -name .git -print0 | xargs -0 rm -v
+	@$(call patchin, MONO)
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
@@ -45,7 +58,7 @@ MONO_CONF_OPT	:= \
 	--disable-solaris-tar-check \
 	--disable-nls \
 	--disable-mcs-build \
-	--enable-quiet-build \
+	--enable-silent-rules \
 	--disable-parallel-mark \
 	--disable-dev-random \
 	--enable-shared-handles \
@@ -53,32 +66,50 @@ MONO_CONF_OPT	:= \
 	--disable-big-arrays \
 	--disable-dtrace \
 	--disable-llvm \
+	--disable-loadedllvm \
 	--disable-mono-debugger \
 	--with-libgdiplus=installed \
-	--with-glib=embedded \
 	--with-gc=included \
 	--with-tls=pthread \
 	--with-sigaltstack=no \
 	--with-static_mono=no \
+	--with-shared_mono=yes \
 	--with-xen_opt=no \
 	--with-large-heap=no \
 	--with-ikvm-native=yes \
-	--with-jit=yes \
-	--with-interp=no \
-	--without-x \
 	--with-profile2=no \
 	--with-profile4=no \
-	--with-moonlight=no \
+	--with-profile4_5=no \
+	--with-monodroid=no \
 	--with-monotouch=no \
+	--with-mobile=no \
 	--with-oprofile=no \
 	--with-malloc-mempools=no \
-	--with-mcs-docs=no
-
-#  --enable-minimal=LIST      drop support for LIST subsystems.
-#     LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug,
-#     reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd,soft_debug.
-
-#  --with-glib=embedded|system    Choose glib API: system or embedded (default to system)
+	--with-mcs-docs=no \
+	--with-lazy-gc-thread-creation=no \
+	--enable-libraries \
+	--enable-executables \
+	--disable-extension-module \
+	--disable-small-config \
+	--enable-system-aot \
+	--enable-boehm \
+	--disable-nacl-codegen \
+	--disable-nacl-gc \
+	--disable-icall-symbol-map \
+	--enable-icall-export \
+	--disable-icall-tables \
+	--with-jumptables=no \
+	--with-sgen=no
+
+# --enable-minimal=LIST      drop support for LIST subsystems.
+# --with-crosspkgdir=/path/to/pkg-config/dir      Change pkg-config dir to custom dir
+#
+# LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug,
+# appdomains, verifier, reflection_emit, reflection_emit_save, large_code,
+# logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters,
+# normalization, assembly_remapping, shared_perfcounters, remoting, security,
+# sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed,
+# sgen_marksweep_fixed_par, sgen_copying.],
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.8.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de