Commit 52e70f91 authored by Ariadne Conill's avatar Ariadne Conill 🐰
Browse files

community/erlang: fix signal handling

parent 9117afd4
......@@ -5,7 +5,7 @@
pkgname=erlang
pkgver=21.2.6
_srcver=$pkgver
pkgrel=0
pkgrel=1
pkgdesc="General-purpose programming language and runtime environment"
url="http://www.erlang.org/"
license="Apache-2.0"
......@@ -55,6 +55,7 @@ options="!check"
source="https://github.com/erlang/otp/archive/OTP-$_srcver.tar.gz
0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
0010-fix-nteventlog-remove.patch
safe-signal-handling.patch
"
builddir="$srcdir/otp-OTP-$_srcver"
......@@ -179,4 +180,5 @@ dev() {
sha512sums="0d43a5eb6e9d01e2997b7c82a15b2bd7483a0623f86f8aaff3ec59b5da6aa2cd8135d48cf66233e28c780473f83b90ad56c076374273cefa79b79622e57027f9 OTP-21.2.6.tar.gz
5d377faccd73382bc86c5aa3182767bc5d1639220c78c2f624135f597f3c823a6871ff13f6f8a109baa8a9ae5d215233b40193e5cfe07af275aa53f327e956de 0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
bb4346dabe17115bc310837c5f0aeb367a745d8ba2159495084e599d0419fc57648d144c811306914ac48d0e087d6150a356f38640ba070642b4578acc5fe573 0010-fix-nteventlog-remove.patch"
bb4346dabe17115bc310837c5f0aeb367a745d8ba2159495084e599d0419fc57648d144c811306914ac48d0e087d6150a356f38640ba070642b4578acc5fe573 0010-fix-nteventlog-remove.patch
dc2fe08e40c73b48b356382c43c982f9f0091e601bbdf6e032358bd5c74c3573b423ef4df454b87c8534105fdbc19ce2245609cc7d5679109c15abaf56d3ef69 safe-signal-handling.patch"
--- 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment