summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--user/erlang/APKBUILD11
-rw-r--r--user/erlang/safe-signal-handling.patch22
2 files changed, 5 insertions, 28 deletions
diff --git a/user/erlang/APKBUILD b/user/erlang/APKBUILD
index 3c0e6ad73..befef61d9 100644
--- a/user/erlang/APKBUILD
+++ b/user/erlang/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=erlang
-pkgver=22.0.7
+pkgver=22.1.1
pkgrel=0
pkgdesc="Soft real-time system programming language"
url="https://www.erlang.org/"
@@ -13,7 +13,6 @@ makedepends="autoconf automake flex libxml2-utils libxslt-dev m4 ncurses-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
"
builddir="$srcdir/otp-OTP-$pkgver"
@@ -28,7 +27,8 @@ build() {
--localstatedir=/var \
--enable-shared-zlib \
--enable-ssl=dynamic-ssl-lib \
- --enable-threads
+ --enable-threads \
+ --disable-hipe
make
}
@@ -51,6 +51,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="cf84cc20b97ed46f9ab3c7f1d77bcf6254ac3ebbb5c1e4e5202f4d5ba3d9c3bf5542567b047edaa68c204bc67ca667b1d96eb8153ac660e628c78fe271b6a8d9 erlang-22.0.7.tar.gz
-91c62e6a894d6f1ae371025e49c02ff25f1cc244fb18c8eae87c9e031d8216bab901b8d278df67db08f260f0d56fa18122f191405e4d58ca64934259f156b907 fix-wx-linking.patch
-dc2fe08e40c73b48b356382c43c982f9f0091e601bbdf6e032358bd5c74c3573b423ef4df454b87c8534105fdbc19ce2245609cc7d5679109c15abaf56d3ef69 safe-signal-handling.patch"
+sha512sums="ee1a3bb355ffd083c3355caf60189799d322cff2a01314ba5df141ccdc4de45dbfe3967e661e3dfbcf14fc04dc1f855d7a3660f9b2daa2451a83422eda7cba39 erlang-22.1.1.tar.gz
+91c62e6a894d6f1ae371025e49c02ff25f1cc244fb18c8eae87c9e031d8216bab901b8d278df67db08f260f0d56fa18122f191405e4d58ca64934259f156b907 fix-wx-linking.patch"
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