summaryrefslogtreecommitdiff
path: root/lang/ocaml
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2015-09-08 18:54:41 +0000
committerjoerg <joerg@pkgsrc.org>2015-09-08 18:54:41 +0000
commitb80115b5abb46178677c4f54af55b50a7885219c (patch)
treecc3b12cb73bbc2a6ca48d4c54cc05f7a91357bf6 /lang/ocaml
parent3ec72e6d1fc24808e552b55a7860db2d20d81818 (diff)
downloadpkgsrc-b80115b5abb46178677c4f54af55b50a7885219c.tar.gz
Avoid UB of left-shift of negative values by replacing it with a
multiplication. Remove duplicate PKGREVISION. Bump revision.
Diffstat (limited to 'lang/ocaml')
-rw-r--r--lang/ocaml/Makefile5
-rw-r--r--lang/ocaml/distinfo3
-rw-r--r--lang/ocaml/patches/patch-byterun_caml_mlvalues.h13
3 files changed, 17 insertions, 4 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index c01389aa216..a2f39cafe8f 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.99 2015/09/02 04:23:11 dholland Exp $
+# $NetBSD: Makefile,v 1.100 2015/09/08 18:54:41 joerg Exp $
.include "Makefile.common"
-PKGREVISION= 1
-PKGREVISION= 1
+PKGREVISION= 2
#CONFIGURE_ARGS+= -no-tk
#CONFIGURE_ARGS+= -cc ${CC}
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 875b6939ca9..9b477f5fc99 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.89 2015/08/22 10:45:13 jaapb Exp $
+$NetBSD: distinfo,v 1.90 2015/09/08 18:54:41 joerg Exp $
SHA1 (ocaml-4.02.3.tar.gz) = e68ffd2b5bb491a6345f46b27675e1361a49b274
RMD160 (ocaml-4.02.3.tar.gz) = 3946204b9396a7fb81ae1042ce67a494579c151b
@@ -11,6 +11,7 @@ SHA1 (patch-asmrun_arm.S) = af62872815fd9cb996f3ce6a1fbaec5b568b70d1
SHA1 (patch-asmrun_power-bsd.S) = 5428a486835a0254a1768b3157b6b1fdf5ae8dd3
SHA1 (patch-asmrun_signals_osdep.h) = 9e127a8df77c48a9504d7cc28ba99b00e29c77f6
SHA1 (patch-byterun_Makefile) = 271dc8c7ee08235e1466afd103657e5cec4a25bb
+SHA1 (patch-byterun_caml_mlvalues.h) = f5f7a52ff8b7dcb77fc39724fe2f2cd8a9271ece
SHA1 (patch-config_auto__aux_gethostbyaddr.c) = ce724831e93081d3e51a122fef14b17543c3221c
SHA1 (patch-config_auto__aux_gethostbyname.c) = f05a6026a18ca7557558383103c6a2fc08caee28
SHA1 (patch-configure) = d79689cf685827dd9ad2ce59ea3a8f63eb3c58a8
diff --git a/lang/ocaml/patches/patch-byterun_caml_mlvalues.h b/lang/ocaml/patches/patch-byterun_caml_mlvalues.h
new file mode 100644
index 00000000000..04ac7e7e91c
--- /dev/null
+++ b/lang/ocaml/patches/patch-byterun_caml_mlvalues.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-byterun_caml_mlvalues.h,v 1.1 2015/09/08 18:54:41 joerg Exp $
+
+--- byterun/caml/mlvalues.h.orig 2015-09-03 12:17:44.000000000 +0000
++++ byterun/caml/mlvalues.h
+@@ -68,7 +68,7 @@ typedef uintnat mark_t;
+
+ /* Conversion macro names are always of the form "to_from". */
+ /* Example: Val_long as in "Val from long" or "Val of long". */
+-#define Val_long(x) (((intnat)(x) << 1) + 1)
++#define Val_long(x) ((intnat)(x) * 2 + 1)
+ #define Long_val(x) ((x) >> 1)
+ #define Max_long (((intnat)1 << (8 * sizeof(value) - 2)) - 1)
+ #define Min_long (-((intnat)1 << (8 * sizeof(value) - 2)))