Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mono 6.12 for DSM 7.0 #4669

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions cross/mono/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
PKG_NAME = mono
PKG_VERS = 5.20.1.34
PKG_EXT = tar.bz2
PKG_VERS = 6.12.0.122
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://download.mono-project.com/sources/mono
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

UNSUPPORTED_ARCHS = 88f6281

DEPENDS = native/$(PKG_NAME)

HOMEPAGE = https://www.mono-project.com
Expand All @@ -25,7 +27,7 @@ CONFIGURE_ARGS = --disable-mcs-build
# patches/001-add-boringssl-alignas-support.patch adds the necessary compatibility
CONFIGURE_ARGS += --enable-btls
# Optimize compilation for size
ADDITIONAL_CFLAGS = -Os
ADDITIONAL_CFLAGS = -Os -I./libatomic_ops/src

include ../../mk/spksrc.cross-cc.mk

Expand Down
65 changes: 22 additions & 43 deletions cross/mono/PLIST
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
rsc:bin/al
rsc:bin/al2
rsc:bin/csc
rsc:bin/csc-dim
rsc:bin/csi
rsc:bin/gacutil
rsc:bin/gacutil2
Expand All @@ -16,62 +15,43 @@ rsc:bin/mdoc-update
rsc:bin/mdoc-validate
rsc:bin/mdvalidater
rsc:bin/mkbundle
bin:bin/mono
bin:bin/mono-boehm
rsc:bin/mono
rsc:bin/mono-boehm
rsc:bin/mono-configuration-crypto
rsc:bin/monodis
rsc:bin/monodocer
rsc:bin/monodocs2html
rsc:bin/monodocs2slashdoc
rsc:bin/mono-find-provides
rsc:bin/mono-find-requires
rsc:bin/mono-gdb.py
rsc:bin/mono-heapviz
rsc:bin/monop
rsc:bin/monop2
rsc:bin/mono-package-runtime
rsc:bin/mono-service
rsc:bin/mono-service2
bin:bin/mono-sgen
rsc:bin/mono-sgen
rsc:bin/mono-sgen-gdb.py
rsc:bin/mono-test-install
bin:bin/mprof-report
rsc:bin/nunit-console
rsc:bin/nunit-console2
rsc:bin/nunit-console4
rsc:bin/monodis
rsc:bin/monodocer
rsc:bin/monodocs2html
rsc:bin/monodocs2slashdoc
rsc:bin/monop
rsc:bin/monop2
rsc:bin/mprof-report
rsc:bin/peverify
rsc:bin/resgen
rsc:bin/resgen2
rsc:bin/sn
rsc:bin/vbc
rsc:bin/wsdl
rsc:bin/wsdl2
rsc:etc/mono/2.0/Browsers/Compat.browser
rsc:etc/mono/2.0/DefaultWsdlHelpGenerator.aspx
rsc:etc/mono/2.0/machine.config
rsc:etc/mono/2.0/settings.map
rsc:etc/mono/2.0/web.config
rsc:etc/mono/4.0/Browsers/Compat.browser
rsc:etc/mono/4.0/DefaultWsdlHelpGenerator.aspx
rsc:etc/mono/4.0/machine.config
rsc:etc/mono/4.0/settings.map
rsc:etc/mono/4.0/web.config
rsc:etc/mono/4.5/Browsers/Compat.browser
rsc:etc/mono/4.5/DefaultWsdlHelpGenerator.aspx
rsc:etc/mono/4.5/machine.config
rsc:etc/mono/4.5/settings.map
rsc:etc/mono/4.5/web.config
rsc:etc/mono/browscap.ini
rsc:etc/mono/config
lib:lib/libMonoPosixHelper.so
lib:lib/libMonoSupportW.so
lib:lib/libikvm-native.so
lnk:lib/libmono-2.0.so
lnk:lib/libmono-2.0.so.1
lib:lib/libmono-2.0.so.1.0.0
lnk:lib/libmonoboehm-2.0.so
lnk:lib/libmonoboehm-2.0.so.1
lib:lib/libmonoboehm-2.0.so.1.0.0
lib:lib/libmono-btls-shared.so
lib:lib/libMonoPosixHelper.so
lnk:lib/libmono-native.so
lnk:lib/libmono-native.so.0
lib:lib/libmono-native.so.0.0.0
lnk:lib/libmono-profiler-aot.so
lnk:lib/libmono-profiler-aot.so.0
lib:lib/libmono-profiler-aot.so.0.0.0
Expand All @@ -81,14 +61,13 @@ lib:lib/libmono-profiler-coverage.so.0.0.0
lnk:lib/libmono-profiler-log.so
lnk:lib/libmono-profiler-log.so.0
lib:lib/libmono-profiler-log.so.0.0.0
lnk:lib/libmonoboehm-2.0.so
lnk:lib/libmonoboehm-2.0.so.1
lib:lib/libmonoboehm-2.0.so.1.0.0
lnk:lib/libmonosgen-2.0.so
lnk:lib/libmonosgen-2.0.so.1
lib:lib/libmonosgen-2.0.so.1.0.0
lib:lib/libMonoSupportW.so
lnk:lib/libmono-native.so
lnk:lib/libmono-native.so.0
lib:lib/libmono-native.so.0.0.0
rsc:lib/mono/lldb/mono.py
rsc:share/mono-2.0/mono/cil/cil-opcodes.xml
rsc:share/mono-2.0/mono/eglib/eglib-config.h
rsc:share/mono-2.0/mono/profiler/mono-profiler-coverage.suppression
rsc:share/locale/de/LC_MESSAGES/mcs.mo
rsc:share/locale/es/LC_MESSAGES/mcs.mo
rsc:share/locale/ja/LC_MESSAGES/mcs.mo
rsc:share/locale/pt_BR/LC_MESSAGES/mcs.mo
6 changes: 3 additions & 3 deletions cross/mono/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mono-5.20.1.34.tar.bz2 SHA1 06f6bce0644c87ed132f3f2155a940c3b6fcf8e6
mono-5.20.1.34.tar.bz2 SHA256 cd91d44cf62515796ba90dfdc274bb33471c25a2f1a262689a3bdc0a672b7c8b
mono-5.20.1.34.tar.bz2 MD5 b4af6c8d1f23f19809a5c18d43bac613
mono-6.12.0.122.tar.xz SHA1 0ddc92fccdeaa88aa8301421f2d997fdb9d1437e
mono-6.12.0.122.tar.xz SHA256 29c277660fc5e7513107aee1cbf8c5057c9370a4cdfeda2fc781be6986d89d23
mono-6.12.0.122.tar.xz MD5 c63315bd37bee9c9cc6c6cfbc484434f
4 changes: 2 additions & 2 deletions native/mono/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PKG_NAME = mono
PKG_VERS = 5.20.1.34
PKG_EXT = tar.bz2
PKG_VERS = 6.12.0.122
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://download.mono-project.com/sources/$(PKG_NAME)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
Expand Down
6 changes: 3 additions & 3 deletions native/mono/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mono-5.20.1.34.tar.bz2 SHA1 06f6bce0644c87ed132f3f2155a940c3b6fcf8e6
mono-5.20.1.34.tar.bz2 SHA256 cd91d44cf62515796ba90dfdc274bb33471c25a2f1a262689a3bdc0a672b7c8b
mono-5.20.1.34.tar.bz2 MD5 b4af6c8d1f23f19809a5c18d43bac613
mono-6.12.0.122.tar.xz SHA1 0ddc92fccdeaa88aa8301421f2d997fdb9d1437e
mono-6.12.0.122.tar.xz SHA256 29c277660fc5e7513107aee1cbf8c5057c9370a4cdfeda2fc781be6986d89d23
mono-6.12.0.122.tar.xz MD5 c63315bd37bee9c9cc6c6cfbc484434f
9 changes: 6 additions & 3 deletions spk/mono/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SPK_NAME = mono
SPK_VERS = 5.20.1.34
SPK_REV = 17
SPK_VERS = 6.12.0.122
SPK_REV = 18
SPK_ICON = src/mono.png

DEPENDS = cross/$(SPK_NAME)
Expand All @@ -9,13 +9,16 @@ MAINTAINER = hgy59
DESCRIPTION = Cross platform, open source .NET development framework
DISPLAY_NAME = Mono
STARTABLE = no
CHANGELOG = "1. Update to version 5.20.1.34<br/>2. Fix workaround for ARMv5 (88f628x archs)"
DigitalBox98 marked this conversation as resolved.
Show resolved Hide resolved

CHANGELOG = "Update to version 6.12"

HOMEPAGE = https://mono-project.com
LICENSE = https://www.mono-project.com/docs/faq/licensing

SERVICE_SETUP = src/service-setup.sh

UNSUPPORTED_ARCHS = 88f6281

POST_STRIP_TARGET = mono_extra_install

MONO_NATIVE_INSTALL = $(WORK_DIR)/../../../native/$(SPK_NAME)/work-native/install
Expand Down