diff options
Diffstat (limited to 'user/erlang')
| -rw-r--r-- | user/erlang/APKBUILD | 23 | ||||
| -rw-r--r-- | user/erlang/fix-wx-linking.patch | 11 | ||||
| -rw-r--r-- | user/erlang/safe-signal-handling.patch | 22 |
3 files changed, 8 insertions, 48 deletions
diff --git a/user/erlang/APKBUILD b/user/erlang/APKBUILD index 3c0e6ad73..31778994d 100644 --- a/user/erlang/APKBUILD +++ b/user/erlang/APKBUILD @@ -1,24 +1,20 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=erlang -pkgver=22.0.7 +pkgver=27.0 pkgrel=0 pkgdesc="Soft real-time system programming language" url="https://www.erlang.org/" arch="all" license="Apache-2.0" depends="" -makedepends="autoconf automake flex libxml2-utils libxslt-dev m4 ncurses-dev - openssl-dev perl unixodbc-dev" +makedepends="flex libxml2-utils libxslt-dev ncurses-dev openssl-dev perl + unixodbc-dev" subpackages="$pkgname-dev" -source="erlang-$pkgver.tar.gz::https://github.com/erlang/otp/archive/OTP-$pkgver.tar.gz - fix-wx-linking.patch - safe-signal-handling.patch - " +source="erlang-$pkgver.tar.gz::https://github.com/erlang/otp/archive/OTP-$pkgver.tar.gz" builddir="$srcdir/otp-OTP-$pkgver" build() { - ./otp_build autoconf ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,19 +24,18 @@ build() { --localstatedir=/var \ --enable-shared-zlib \ --enable-ssl=dynamic-ssl-lib \ - --enable-threads + --enable-threads \ + --disable-hipe make } check() { - local _header export ERL_TOP=$builddir make release_tests for _header in erl_fixed_size_int_types.h \ - ${CHOST}/erl_int_sizes_config.h \ - erl_memory_trace_parser.h; do + ${CHOST}/erl_int_sizes_config.h; do cp erts/include/$_header erts/emulator/beam/ done cd release/tests/test_server @@ -51,6 +46,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cf84cc20b97ed46f9ab3c7f1d77bcf6254ac3ebbb5c1e4e5202f4d5ba3d9c3bf5542567b047edaa68c204bc67ca667b1d96eb8153ac660e628c78fe271b6a8d9 erlang-22.0.7.tar.gz -91c62e6a894d6f1ae371025e49c02ff25f1cc244fb18c8eae87c9e031d8216bab901b8d278df67db08f260f0d56fa18122f191405e4d58ca64934259f156b907 fix-wx-linking.patch -dc2fe08e40c73b48b356382c43c982f9f0091e601bbdf6e032358bd5c74c3573b423ef4df454b87c8534105fdbc19ce2245609cc7d5679109c15abaf56d3ef69 safe-signal-handling.patch" +sha512sums="16945c50c09caad9aac6808470ea2a0e282713f23e54cd4ad60510b114811b5deac427acb36cc8049443b4e3c3302c40b02c696cf3f2028f8bd3e836c8c48ea9 erlang-27.0.tar.gz" diff --git a/user/erlang/fix-wx-linking.patch b/user/erlang/fix-wx-linking.patch deleted file mode 100644 index e1e8d4333..000000000 --- a/user/erlang/fix-wx-linking.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- otp-OTP-22.0.7/lib/wx/configure.in.old 2019-07-10 16:05:15.000000000 +0000 -+++ otp-OTP-22.0.7/lib/wx/configure.in 2019-08-07 01:00:20.532799505 +0000 -@@ -650,7 +650,7 @@ - // it isn't in too old wxWidgets versions - wxString test = wxString::FromUTF8((const char *)"foo"); - wxStyledTextCtrl * foo = new wxStyledTextCtrl(); -- wxGLCanvas * bar = new wxGLCanvas((wxWindow *) NULL, -1, -+ wxGLCanvas * bar = new wxGLCanvas((wxWindow *) NULL, -1, NULL, - wxDefaultPosition,wxDefaultSize,0); - return true; - }; diff --git a/user/erlang/safe-signal-handling.patch b/user/erlang/safe-signal-handling.patch deleted file mode 100644 index 0996069ba..000000000 --- a/user/erlang/safe-signal-handling.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- otp-OTP-21.2.6.orig/erts/emulator/hipe/hipe_x86_signal.c -+++ otp-OTP-21.2.6/erts/emulator/hipe/hipe_x86_signal.c -@@ -159,16 +159,10 @@ - - #if !(defined(__GLIBC__) || defined(__DARWIN__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__sun__)) - /* -- * Unknown libc -- assume musl. Note: musl deliberately does not provide a musl-specific -- * feature test macro, so we cannot check for it. -- * -- * sigaction is a weak alias for __sigaction, which is a wrapper for __libc_sigaction. -- * There are libc-internal calls to __libc_sigaction which install handlers, so we must -- * override __libc_sigaction rather than __sigaction. -+ * Unknown libc -- assume musl. Also assume signal delivery on musl is safe. - */ --#define NEXT_SIGACTION "__libc_sigaction" --#define LIBC_SIGACTION __libc_sigaction --#define OVERRIDE_SIGACTION -+#undef NEXT_SIGACTION -+#undef OVERRIDE_SIGACTION - #ifndef _NSIG - #define _NSIG NSIG - #endif |