diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2015-04-27 12:55:24 +0200 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2015-04-27 12:55:31 +0200 |
| commit | ff8f4d9b185ab2d6738968ae28909472802145aa (patch) | |
| tree | 0ad55b2ccef482ba9f578aecd8894a5ba2fd84ac | |
| parent | 22e989225dc0888ab97ad89dda83ae9a5a6d2c1b (diff) | |
| download | aports-ff8f4d9b185ab2d6738968ae28909472802145aa.tar.bz2 aports-ff8f4d9b185ab2d6738968ae28909472802145aa.tar.xz | |
testing/mono: upgrade to 4.0.0 alpha1
| -rw-r--r-- | testing/mono/APKBUILD | 37 | ||||
| -rw-r--r-- | testing/mono/musl-fix.patch | 43 |
2 files changed, 16 insertions, 64 deletions
diff --git a/testing/mono/APKBUILD b/testing/mono/APKBUILD index c6d78a38a3..b3a591191a 100644 --- a/testing/mono/APKBUILD +++ b/testing/mono/APKBUILD @@ -1,21 +1,21 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=mono -pkgver=3.12.1 +pkgver=4.0.0_alpha1 pkgrel=0 pkgdesc="Free implementation of the .NET platform including runtime and compiler" url="http://www.mono-project.com/" -arch="" +arch="all" license="GPL" depends="" depends_dev="zlib-dev libgdiplus-dev" -makedepends="$depends_dev python linux-headers autoconf automake libtool paxctl" +makedepends="$depends_dev python linux-headers paxmark autoconf automake libtool" install="" -subpackages="$pkgname-dev $pkgname-doc" -source="http://download.mono-project.com/sources/mono/mono-$pkgver.tar.bz2 - musl-fix.patch" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="http://download.mono-project.com/sources/mono/mono-${pkgver/_/~}.tar.bz2" + +_builddir="$srcdir"/mono-${pkgver%%_*} -_builddir="$srcdir"/mono-$pkgver prepare() { local i cd "$_builddir" @@ -24,13 +24,11 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done - sed '/exec "/ i\paxctl -mr "$r/@mono_runtime@"' \ - -i runtime/mono-wrapper.in \ - || return 1 } build() { cd "$_builddir" + # supplied configure has linker issues with make install ./autogen.sh \ --build=$CBUILD \ --host=$CHOST \ @@ -39,26 +37,23 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --localstatedir=/var \ - --disable-nls \ - --bindir=/usr/bin \ - --sbindir=/usr/bin \ --disable-quiet-build \ --disable-system-aot \ --disable-static \ --with-mcs-docs=no \ + --disable-boehm \ + --without-sigaltstack \ || return 1 - make || return 1 + # dirty hack to set paxmark on grsec kernels + make || paxmark -mr mono/mini/.libs/lt-mono-sgen && make || return 1 } package() { cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 + make -j1 DESTDIR="$pkgdir" install || return 1 rm -f "$pkgdir"/usr/lib/*.la } -md5sums="ccab015f0c54ffeccd2924b44885809c mono-3.12.1.tar.bz2 -493f2a7df6d05f3513e5823e6ce32b87 musl-fix.patch" -sha256sums="5d8cf153af2948c06bc9fbf5088f6834868e4db8e5f41c7cff76da173732b60d mono-3.12.1.tar.bz2 -a51ed2b5fb533794dd5ac36a40e5db08dfa2fd142fe944dc81293b3ec59b0627 musl-fix.patch" -sha512sums="7ff87d95c347186347dc7a9ffb767112717de2b808f8f1b612c56c9eb70fdcc0c8f586989be44444509a2768e71854d8195567196c992cc2c5b184ecbe5ac190 mono-3.12.1.tar.bz2 -772740bb7a070b299dd4edac30e859588c566ed83f937f087ea2eb1e72c5ecc75fabff3f49900a5c1fb7b059404cb31c9ce3528c2614f7142d66f98ae2c3e9de musl-fix.patch" +md5sums="192608d5c99100dd79756c2036f1feda mono-4.0.0~alpha1.tar.bz2" +sha256sums="d536bdb07006d568e687124b9449464c98eebc93619dd704390376a1aacb15c3 mono-4.0.0~alpha1.tar.bz2" +sha512sums="0243fb847f20e3b5a4c1ada76314d860a27d48ea676eae646c31f3f6ada32035ecb2088dbfbe473a4235fbb416c1c8e4bef1358845d31785fa484dae737defa8 mono-4.0.0~alpha1.tar.bz2" diff --git a/testing/mono/musl-fix.patch b/testing/mono/musl-fix.patch deleted file mode 100644 index abb97fbb18..0000000000 --- a/testing/mono/musl-fix.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/libgc/os_dep.c.orig -+++ b/libgc/os_dep.c -@@ -41,7 +41,7 @@ - # else /* not 2 <= __GLIBC__ */ - /* libc5 doesn't have <sigcontext.h>: go directly with the kernel */ - /* one. Check LINUX_VERSION_CODE to see which we should reference. */ --# include <asm/sigcontext.h> -+/*# include <asm/sigcontext.h>*/ - # endif /* 2 <= __GLIBC__ */ - # endif - # endif ---- a/mono/metadata/file-mmap-posix.c.orig -+++ b/mono/metadata/file-mmap-posix.c -@@ -37,6 +37,10 @@ - #include <mono/utils/mono-memory-model.h> - #include <mono/utils/mono-mmap.h> - -+#ifndef DEFFILEMODE -+#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) /* 0666 */ -+#endif -+ - typedef struct { - int kind; - int ref_count; ---- a/mono/unit-tests/Makefile.am.orig -+++ b/mono/unit-tests/Makefile.am -@@ -28,14 +28,9 @@ - test_mono_linked_list_set_LDADD = $(TEST_LDADD) - test_mono_linked_list_set_LDFLAGS = $(TEST_LDFLAGS) - --test_conc_hashtable_SOURCES = test-conc-hashtable.c --test_conc_hashtable_CFLAGS = $(TEST_CFLAGS) --test_conc_hashtable_LDADD = $(TEST_LDADD) --test_conc_hashtable_LDFLAGS = $(TEST_LDFLAGS) -+noinst_PROGRAMS = test-sgen-qsort test-gc-memfuncs test-mono-linked-list-set - --noinst_PROGRAMS = test-sgen-qsort test-gc-memfuncs test-mono-linked-list-set test-conc-hashtable -- --TESTS = test-sgen-qsort test-gc-memfuncs test-mono-linked-list-set test-conc-hashtable -+TESTS = test-sgen-qsort test-gc-memfuncs test-mono-linked-list-set - - endif !PLATFORM_GNU - endif SUPPORT_BOEHM |