From 7c7d42bf62b4e3204ed9685573c4623f6d987a7c Mon Sep 17 00:00:00 2001
From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
Date: Thu, 9 Oct 2014 15:45:41 +0200
Subject: [PATCH 2/2] mono: new package
This patch adds the complete Mono implementation. This patch builds
both the native and managed parts.
[Thomas:
- Merge mono-managed and mono-native as a single package. The
mono-managed stuff is done by the host variant of the mono
package, while the mono-native stuff is done as the target variant
of the mono package.
- Introduce a BR2_PACKAGE_MONO_ARCH_SUPPORTS blind Config.in option
to make sure the IPv6 related comment is not displayed when the
architecture being used anyway doesn't support Mono.
- Add a patch to Mono to fix the C library path when uClibc and Musl
is used. This is a better approach than the
POST_INSTALL_TARGET_HOOKS because this approach can potentially be
submitted upstreamed, which ultimately allows to simplify the
Buildroot package.
- Depend on a 'monolite' package, and use it instead of letting Mono
download Monolite by itself, which circumvents Buildroot's
download infrastructure.
- Move the installation of Mono libraries to the target Mono
package, as a POST_INSTALL_TARGET_HOOKS.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in | 1 +
package/mono/Config.in | 19 ++++++++++
package/mono/mono-001-fix-uclibc.patch | 14 ++++++++
package/mono/mono-002-support-uclibc-musl.patch | 25 +++++++++++++
package/mono/mono.mk | 48 +++++++++++++++++++++++++
5 files changed, 107 insertions(+)
create mode 100644 package/mono/Config.in
create mode 100644 package/mono/mono-001-fix-uclibc.patch
create mode 100644 package/mono/mono-002-support-uclibc-musl.patch
create mode 100644 package/mono/mono.mk
@@ -433,6 +433,7 @@ menu "Lua libraries/modules"
source "package/xavante/Config.in"
endmenu
endif
+ source "package/mono/Config.in"
source "package/nodejs/Config.in"
source "package/perl/Config.in"
if BR2_PACKAGE_PERL
new file mode 100644
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_MONO_ARCH_SUPPORTS
+ bool
+ default y if (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \
+ BR2_mipsel || BR2_powerpc || BR2_sparc || BR2_x86_64)
+
+config BR2_PACKAGE_MONO
+ bool "mono"
+ select BR2_STRIP_none
+ depends on BR2_PACKAGE_MONO_ARCH_SUPPORTS
+ depends on BR2_INET_IPV6
+ help
+ An open source, cross-platform, implementation of C# and the
+ CLR that is binary compatible with Microsoft.NET.
+
+ http://download.mono-project.com/sources/mono/
+
+comment "mono needs a toolchain w/ IPv6"
+ depends on BR2_PACKAGE_MONO_ARCH_SUPPORTS
+ depends on !BR2_INET_IPV6
new file mode 100644
@@ -0,0 +1,14 @@
+Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
+
+diff -purN mono-native-3.8.0.orig/libgc/include/gc.h mono-native-3.8.0/libgc/include/gc.h
+--- mono-native-3.8.0.orig/libgc/include/gc.h 2014-10-07 15:00:21.259466731 +0200
++++ mono-native-3.8.0/libgc/include/gc.h 2014-10-07 15:05:25.560975681 +0200
+@@ -500,7 +500,7 @@ GC_API GC_PTR GC_malloc_atomic_ignore_of
+ #ifdef __linux__
+ # include <features.h>
+ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
+- && !defined(__ia64__)
++ && !defined(__ia64__) && !defined(__UCLIBC__)
+ # ifndef GC_HAVE_BUILTIN_BACKTRACE
+ # define GC_HAVE_BUILTIN_BACKTRACE
+ # endif
new file mode 100644
@@ -0,0 +1,25 @@
+Adjust libc.so path depending on C library being used
+
+By default, on Linux systems, Mono assumes that the C library is
+libc.so.6. While this is true for glibc, it is not true for uClibc and
+Musl based systems. This patch adds support for such systems.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -2973,6 +2973,12 @@
+ SQLITE="libsqlite.so"
+ SQLITE3="libsqlite3.so"
+ ;;
++ *-*-*uclibc*)
++ LIBC="libc.so.0"
++ ;;
++ *-*-*musl*)
++ LIBC="libc.so"
++ ;;
+ *-*-*linux*)
+ AC_PATH_X
+ dlsearch_path=`(libtool --config ; echo eval echo \\$sys_lib_dlsearch_path_spec) | sh`
new file mode 100644
@@ -0,0 +1,48 @@
+#############################################################
+#
+# mono
+#
+#############################################################
+
+MONO_VERSION = 3.8.0
+MONO_SITE = http://download.mono-project.com/sources/mono/
+MONO_SOURCE = mono-$(MONO_VERSION).tar.bz2
+MONO_LICENSE = <something useful needed here>
+MONO_LICENSE_FILES = <something usefule needed here>
+MONO_INSTALL_STAGING = YES
+
+# patching configure.ac
+MONO_AUTORECONF = YES
+
+MONO_CONF_OPTS = \
+ --disable-gtk-doc \
+ --with-mcs-docs=no \
+ --with-moonlight=no \
+ --disable-mcs-build
+
+MONO_DEPENDENCIES = host-mono
+
+define MONO_INSTALL_LIBS
+ rsync -av --exclude=*.so $(HOST_DIR)/usr/lib/mono $(TARGET_DIR)/usr/lib/
+endef
+
+MONO_POST_INSTALL_TARGET_HOOKS += MONO_INSTALL_LIBS
+
+HOST_MONO_CONF_OPTS = \
+ --disable-gtk-doc \
+ --with-mcs-docs=no \
+ --with-moonlight=no \
+ --enable-static \
+ --enable-minimal=aot,profiler
+
+HOST_MONO_DEPENDENCIES = host-monolite
+
+define HOST_MONO_SETUP_MONOLITE
+ rm -rf $(@D)/mcs/class/lib/monolite
+ (cd $(@D)/mcs/class/lib; ln -s $(HOST_DIR)/usr/lib/monolite monolite)
+endef
+
+HOST_MONO_POST_CONFIGURE_HOOKS += HOST_MONO_SETUP_MONOLITE
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
--
2.0.0