summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Volodymyr Medvid <vmedvid@riseup.net> 2016-10-07 13:49:52 +0300
committerAvatar Wulf C. Krueger <philantrop@exherbo.org> 2016-10-16 11:51:37 +0200
commit637d73aa76c72349f0d2561939124af88815d9ba (patch)
tree2b45ee990bbc347947e789bf0e4c39aa72ff19be
parent59663f1ef7e6244906d2aa32b01a3e093fbb0dab (diff)
downloadmono-637d73aa76c72349f0d2561939124af88815d9ba.tar.gz
mono-637d73aa76c72349f0d2561939124af88815d9ba.tar.xz
mono: bump to 4.6.1.3
Change-Id: I52af30ec777f28122d0d5c3597ee97a8c6011e46 Reviewed-on: https://galileo.mailstation.de/gerrit/7352 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Wulf C. Krueger <philantrop@exherbo.org>
-rw-r--r--packages/dev-lang/mono/mono-4.6.1.3.exheres-0 (renamed from packages/dev-lang/mono/mono-4.2.2.30.exheres-0)0
-rw-r--r--packages/dev-lang/mono/mono-lang.exlib32
2 files changed, 18 insertions, 14 deletions
diff --git a/packages/dev-lang/mono/mono-4.2.2.30.exheres-0 b/packages/dev-lang/mono/mono-4.6.1.3.exheres-0
index 06cc520..06cc520 100644
--- a/packages/dev-lang/mono/mono-4.2.2.30.exheres-0
+++ b/packages/dev-lang/mono/mono-4.6.1.3.exheres-0
diff --git a/packages/dev-lang/mono/mono-lang.exlib b/packages/dev-lang/mono/mono-lang.exlib
index 83b115a..69c2143 100644
--- a/packages/dev-lang/mono/mono-lang.exlib
+++ b/packages/dev-lang/mono/mono-lang.exlib
@@ -1,7 +1,7 @@
# Copyright 2008 Saleem Abdulrasool <compnerd@compnerd.org>
# Distributed under the temrs of the GNU General Public License v2
-require mono autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.13 ] ]
+require mono
export_exlib_phases src_prepare src_configure src_test
@@ -26,24 +26,25 @@ DEPENDENCIES="
"
mono-lang_src_prepare() {
+ # use prefixed pkg-config everywhere
edo sed \
- -e "s/pkg-config/$(exhost --tool-prefix)pkg-config/g" \
+ -e "s/pkg-config/ $(exhost --tool-prefix)pkg-config/g" \
-i mcs/class/Mono.Posix/Makefile \
-i mcs/mcs/driver.cs \
-i mcs/tools/mkbundle/mkbundle.cs
- # once this gets fixed upstream,
- # autotools exlib is no more required
+ # make aot-compiler use prefixed 'as'
edo sed \
- -e 's/^\tcpp/\t$(CPP)/' \
- -i mono/mini/Makefile.am.in
+ -e "s/\(--aot=\)/\1tool-prefix=$(exhost --tool-prefix),/" \
+ -i mcs/class/aot-compiler/Makefile
- # delete invalid target from the tests Makefile
+ # delete invalid targets from the tests Makefile
edo sed \
- -e "/^check-local/s/test-unhandled-exception-2//" \
- -i mono/tests/Makefile.am
+ -e "/^check-local/ { N; s/test-unhandled-exception-2//; \
+ s/test-process-stress// }" \
+ -i mono/tests/Makefile.in
- autotools_src_prepare
+ default
}
mono-lang_src_configure() {
@@ -56,6 +57,7 @@ mono-lang_src_configure() {
--enable-parallel-mark \
--enable-system-aot \
--disable-llvm \
+ --disable-vtune \
--with-gc=included \
--with-libgdiplus=$(option X && echo 'installed' || echo 'no') \
--with-profile2 \
@@ -63,20 +65,22 @@ mono-lang_src_configure() {
--with-profile4_5 \
--with-sgen \
--without-ikvm-native \
+ --without-mobile_static \
--without-monodroid \
--without-monotouch \
+ --without-monotouch_tv \
+ --without-monotouch_watch \
--without-moonlight \
+ --without-xammac \
--without-xen_opt \
$(option_with X x)
}
mono-lang_src_test() {
edo pushd mono/tests
- # Disable failing tests (last checked: 4.2.2.30)
+ # Disable failing tests (last checked: 4.6.1.3)
EXTRA_DISABLED_TESTS="appdomain-unload-doesnot-raise-pending-events.exe \
- appdomain-exit.exe async-exc-compilation.exe delegate-delegate-exit.exe \
- delegate2.exe unload-appdomain-on-shutdown.exe threadpool-exceptions2.exe \
- threadpool-exceptions4.exe threadpool-exceptions5.exe main-exit.exe" emake check
+ delegate2.exe unload-appdomain-on-shutdown.exe" emake check
edo popd
edo pushd mcs/tests