mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-28 05:36:32 +00:00
package/mono: bump to version 5.12.0.226
This patch bumps mono to version 5.12.0.226 and it's monolite dependency to version 1051200002, doing so it removes also a couple of upstreamed patches. This new mono version requires also a different option for managing aot, so this patch refactors also the configure options. Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Angelo Compagnucci
Thomas Petazzoni
parent
b3057380b9
commit
80821d3ed8
@ -1,29 +0,0 @@
|
|||||||
From 1c3d615d93b20d10c2729478d5104977dd9af23f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
|
|
||||||
Date: Wed, 5 Aug 2015 12:59:45 +0200
|
|
||||||
Subject: [PATCH] Fixing initialization of have_vasprintf
|
|
||||||
|
|
||||||
This patch initialize properly have_vasprintf in case vasprint function is found.
|
|
||||||
Solves multiple definition of `vasprintf' error in case vasprint is not properly detected.
|
|
||||||
|
|
||||||
Patch is upstream:
|
|
||||||
|
|
||||||
https://github.com/mono/mono/commit/40c171799b671718969ee28a02f92884d7fd181e
|
|
||||||
|
|
||||||
Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
|
|
||||||
---
|
|
||||||
eglib/configure.ac | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/eglib/configure.ac b/eglib/configure.ac
|
|
||||||
index 5281419..4bf91e5 100644
|
|
||||||
--- a/eglib/configure.ac
|
|
||||||
+++ b/eglib/configure.ac
|
|
||||||
@@ -135,6 +135,7 @@ AC_CHECK_SIZEOF(void *)
|
|
||||||
AC_CHECK_SIZEOF(long)
|
|
||||||
AC_CHECK_SIZEOF(long long)
|
|
||||||
AC_CHECK_FUNCS(strlcpy stpcpy strtok_r rewinddir vasprintf)
|
|
||||||
+AC_CHECK_FUNC(vasprintf, have_vasprintf=yes)
|
|
||||||
AC_CHECK_FUNCS(getrlimit)
|
|
||||||
|
|
||||||
#
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
From 26e31fc54af591bdd88d6a4a79b7fa91c57f4b0c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
|
|
||||||
Date: Thu, 10 Aug 2017 23:30:05 +0200
|
|
||||||
Subject: [PATCH] Remove unit-tests from mono compilation
|
|
||||||
|
|
||||||
This patch fixes compiling errors with unit-tests under linux.
|
|
||||||
|
|
||||||
Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
|
|
||||||
---
|
|
||||||
mono/Makefile.am | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/mono/Makefile.am b/mono/Makefile.am
|
|
||||||
index 8c9c2cb..7af36ec 100644
|
|
||||||
--- a/mono/Makefile.am
|
|
||||||
+++ b/mono/Makefile.am
|
|
||||||
@@ -34,7 +34,7 @@ monotouch-do-clean:
|
|
||||||
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \
|
|
||||||
done;
|
|
||||||
else
|
|
||||||
-SUBDIRS = $(btls_dirs) arch utils cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler
|
|
||||||
+SUBDIRS = $(btls_dirs) arch utils cil metadata $(sgen_dirs) mini dis tests benchmark profiler
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
-DIST_SUBDIRS = btls arch utils cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler
|
|
||||||
+DIST_SUBDIRS = btls arch utils cil metadata $(sgen_dirs) mini dis tests benchmark profiler
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
|
|
||||||
@ -1,2 +1,2 @@
|
|||||||
# sha256 locally computed
|
# sha256 locally computed
|
||||||
sha256 2a2f5c2a214a9980c086ac7561a5dd106f13d823a630de218eabafe1d995c5b4 mono-5.4.0.201.tar.bz2
|
sha256 f0636baa0c1399805526142e799cb697ddccf736e506cf1a30a870eaa2830a89 mono-5.12.0.226.tar.bz2
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
MONO_VERSION = 5.4.0.201
|
MONO_VERSION = 5.12.0.226
|
||||||
MONO_SITE = http://download.mono-project.com/sources/mono
|
MONO_SITE = http://download.mono-project.com/sources/mono
|
||||||
MONO_SOURCE = mono-$(MONO_VERSION).tar.bz2
|
MONO_SOURCE = mono-$(MONO_VERSION).tar.bz2
|
||||||
MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial
|
MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial
|
||||||
@ -17,13 +17,15 @@ MONO_INSTALL_STAGING = YES
|
|||||||
# patching configure.ac
|
# patching configure.ac
|
||||||
MONO_AUTORECONF = YES
|
MONO_AUTORECONF = YES
|
||||||
|
|
||||||
# Disable managed code (mcs folder) from building
|
MONO_COMMON_CONF_OPTS = --with-mcs-docs=no \
|
||||||
MONO_CONF_OPTS = --with-mcs-docs=no \
|
|
||||||
--with-ikvm-native=no \
|
--with-ikvm-native=no \
|
||||||
--enable-minimal=profiler,debug,aot \
|
--enable-minimal=profiler,debug \
|
||||||
--disable-mcs-build \
|
|
||||||
--enable-static \
|
--enable-static \
|
||||||
--disable-btls
|
--disable-btls \
|
||||||
|
--disable-system-aot
|
||||||
|
|
||||||
|
# Disable managed code (mcs folder) from building
|
||||||
|
MONO_CONF_OPTS = $(MONO_COMMON_CONF_OPTS) --disable-mcs-build
|
||||||
|
|
||||||
# The libraries have been built by the host-mono build. Since they are
|
# The libraries have been built by the host-mono build. Since they are
|
||||||
# architecture-independent, we simply copy them to the target.
|
# architecture-independent, we simply copy them to the target.
|
||||||
@ -42,12 +44,7 @@ MONO_DEPENDENCIES += host-mono
|
|||||||
|
|
||||||
## Mono managed
|
## Mono managed
|
||||||
|
|
||||||
HOST_MONO_CONF_OPTS = --with-mcs-docs=no \
|
HOST_MONO_CONF_OPTS = $(MONO_COMMON_CONF_OPTS) --disable-libraries
|
||||||
--disable-libraries \
|
|
||||||
--with-ikvm-native=no \
|
|
||||||
--enable-minimal=profiler,debug,aot \
|
|
||||||
--enable-static \
|
|
||||||
--disable-btls
|
|
||||||
|
|
||||||
# ensure monolite is used
|
# ensure monolite is used
|
||||||
HOST_MONO_MAKE_OPTS += EXTERNAL_MCS=false
|
HOST_MONO_MAKE_OPTS += EXTERNAL_MCS=false
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
# sha256 locally computed
|
# sha256 locally computed
|
||||||
sha256 8c893c3eb3efb5006e19fb45a878860265c3f47fbaf2470be47612e84725d9fd monolite-linux-1050400003-latest.tar.gz
|
sha256 fece21adc06118fa5d79d3621a5fc702ec354abf83be29a36f8718645a2dc058 monolite-linux-1051200002-latest.tar.gz
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
MONOLITE_VERSION = 1050400003
|
MONOLITE_VERSION = 1051200002
|
||||||
MONOLITE_SITE = http://download.mono-project.com/monolite
|
MONOLITE_SITE = http://download.mono-project.com/monolite
|
||||||
MONOLITE_SOURCE = monolite-linux-$(MONOLITE_VERSION)-latest.tar.gz
|
MONOLITE_SOURCE = monolite-linux-$(MONOLITE_VERSION)-latest.tar.gz
|
||||||
MONOLITE_LICENSE = LGPL-2.0 or commercial
|
MONOLITE_LICENSE = LGPL-2.0 or commercial
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user