summaryrefslogtreecommitdiff
path: root/lang/ocaml
diff options
context:
space:
mode:
authorjaapb <jaapb@pkgsrc.org>2015-01-26 14:46:51 +0000
committerjaapb <jaapb@pkgsrc.org>2015-01-26 14:46:51 +0000
commitf1858a7fc3f50659a42f512aa58c803c7c7c81b8 (patch)
tree46aeff969ba553a8eaeaa14d4d1c1d195d6a5727 /lang/ocaml
parent9cf5236b86b6335519564ee453a290586e27ae33 (diff)
downloadpkgsrc-f1858a7fc3f50659a42f512aa58c803c7c7c81b8.tar.gz
Added a patch that fixes signal handlers on i386.
Diffstat (limited to 'lang/ocaml')
-rw-r--r--lang/ocaml/distinfo4
-rw-r--r--lang/ocaml/patches/patch-asmrun_signals_osdep.h18
2 files changed, 16 insertions, 6 deletions
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 944a0fa8276..2397a6de4b9 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.79 2015/01/20 14:12:25 jaapb Exp $
+$NetBSD: distinfo,v 1.80 2015/01/26 14:46:51 jaapb Exp $
SHA1 (ocaml-4.02.1.tar.gz) = 6af8c67f2badece81d8e1d1ce70568a16e42313e
RMD160 (ocaml-4.02.1.tar.gz) = fcb30200e9675d92e402b4b7101a032f918f80c1
@@ -9,7 +9,7 @@ SHA1 (patch-asmcomp_power_emit.mlp) = 726e09e4902b96f4790c7a8093eb245dd7028bf4
SHA1 (patch-asmrun_Makefile) = b6301628b71e3fe3553f32342805ae90159cc773
SHA1 (patch-asmrun_arm.S) = af62872815fd9cb996f3ce6a1fbaec5b568b70d1
SHA1 (patch-asmrun_power-bsd.S) = 5428a486835a0254a1768b3157b6b1fdf5ae8dd3
-SHA1 (patch-asmrun_signals_osdep.h) = d9dba52a3e1e0170976e64a1ef1860aa5ab560ae
+SHA1 (patch-asmrun_signals_osdep.h) = aff4c999cb21240b7d99f34cb482fe32efcd356e
SHA1 (patch-byterun_Makefile) = 2b88b35e5ffcccc315542cb814b9e826126acb54
SHA1 (patch-config_auto__aux_gethostbyaddr.c) = ce724831e93081d3e51a122fef14b17543c3221c
SHA1 (patch-config_auto__aux_gethostbyname.c) = f05a6026a18ca7557558383103c6a2fc08caee28
diff --git a/lang/ocaml/patches/patch-asmrun_signals_osdep.h b/lang/ocaml/patches/patch-asmrun_signals_osdep.h
index b55ff09a654..33c887d7e7b 100644
--- a/lang/ocaml/patches/patch-asmrun_signals_osdep.h
+++ b/lang/ocaml/patches/patch-asmrun_signals_osdep.h
@@ -1,9 +1,19 @@
-$NetBSD: patch-asmrun_signals_osdep.h,v 1.2 2014/10/09 19:08:28 jaapb Exp $
+$NetBSD: patch-asmrun_signals_osdep.h,v 1.3 2015/01/26 14:46:51 jaapb Exp $
-Use correct data structures for power architecture
---- asmrun/signals_osdep.h.orig 2014-05-13 13:20:48.000000000 +0000
+Use correct data structures for power architecture; also do signal
+handling correctly for i386
+--- asmrun/signals_osdep.h.orig 2014-09-28 19:46:24.000000000 +0000
+++ asmrun/signals_osdep.h
-@@ -248,12 +248,21 @@
+@@ -161,7 +161,7 @@
+
+ /****************** I386, BSD_ELF */
+
+-#elif defined(TARGET_i386) && defined(SYS_bsd_elf)
++#elif defined(TARGET_i386) && defined(SYS_bsd_elf) && !defined(__NetBSD__)
+
+ #define DECLARE_SIGNAL_HANDLER(name) \
+ static void name(int sig, siginfo_t * info, struct sigcontext * context)
+@@ -278,12 +278,21 @@
sigact.sa_handler = (void (*)(int)) (name); \
sigact.sa_flags = 0