Diff below updates ocaml to 4.11.2.
As usual, camlp4 and camlp5 require updates that are in sync with the
ocaml update.
All consumers were compile tested on amd64 and everything built fine.
(this was tested with the coccinelle diff on ports@ to fix the breakage in
that port)
ok?
Index: lang/ocaml/Makefile
===================================================================
RCS file: /cvs/ports/lang/ocaml/Makefile,v
retrieving revision 1.87
diff -u -p -u -r1.87 Makefile
--- lang/ocaml/Makefile 15 Mar 2021 20:47:22 -0000 1.87
+++ lang/ocaml/Makefile 29 Nov 2021 19:41:47 -0000
@@ -4,8 +4,7 @@ COMMENT = ML language with complete c
# XXX Don't even think of updating ocaml alone.
# Do check that the ports that depend on it still work, or repair them.
-VERSION= 4.10.0
-REVISION= 0
+VERSION= 4.11.2
PKGNAME = ocaml-${VERSION:C/\+//}
@@ -13,8 +12,7 @@ PKGNAME = ocaml-${VERSION:C/\+//}
PKGSPEC = ocaml-=${VERSION:C/\+//}
CATEGORIES= lang
-# Remove last version component ocaml-X.XX.X -> ocaml-X.XX
-BASENAME = ${DISTNAME:C/\.[^.]*$//}
+BASENAME = ${DISTNAME:R}
MASTER_SITES= https://caml.inria.fr/pub/distrib/${BASENAME}/
DOCFILES= ${BASENAME}-refman-html.tar.gz
DISTFILES= ${DISTNAME}.tar.gz ${DOCFILES}
Index: lang/ocaml/distinfo
===================================================================
RCS file: /cvs/ports/lang/ocaml/distinfo,v
retrieving revision 1.27
diff -u -p -u -r1.27 distinfo
--- lang/ocaml/distinfo 9 Jun 2020 17:34:14 -0000 1.27
+++ lang/ocaml/distinfo 29 Nov 2021 19:41:47 -0000
@@ -1,4 +1,4 @@
-SHA256 (ocaml-4.10-refman-html.tar.gz) = /r+sdsa1SDErm5CodiPVv/fiAAhigelOKfdMQeGOn+0=
-SHA256 (ocaml-4.10.0.tar.gz) = WNQx3eZvV1Dr6bFdWhxIcvgNKD3sI0SGibDRpJi35Mc=
-SIZE (ocaml-4.10-refman-html.tar.gz) = 1737359
-SIZE (ocaml-4.10.0.tar.gz) = 4922813
+SHA256 (ocaml-4.11-refman-html.tar.gz) = 88vAwTLfHhI2oWJpAI32Vk6fuLh0XCLGyWjK0TStUHY=
+SHA256 (ocaml-4.11.2.tar.gz) = T1UdfLDAhdxXJW0ZbKUdMvqqywKYyE0JBSuETecCCSE=
+SIZE (ocaml-4.11-refman-html.tar.gz) = 1762039
+SIZE (ocaml-4.11.2.tar.gz) = 4969981
Index: lang/ocaml/patches/patch-asmcomp_amd64_emit_mlp
===================================================================
RCS file: lang/ocaml/patches/patch-asmcomp_amd64_emit_mlp
diff -N lang/ocaml/patches/patch-asmcomp_amd64_emit_mlp
--- lang/ocaml/patches/patch-asmcomp_amd64_emit_mlp 15 Mar 2021 20:47:23 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-asmcomp_amd64_emit_mlp,v 1.6 2021/03/15 20:47:23 naddy Exp $
-
-Fix mergeable section flags and use .rodata.cst16 where appropriate
-https://github.com/ocaml/ocaml/commit/8a46d76bf9359b5cc505b3f2f9c81eb624c631fa
-
-Index: asmcomp/amd64/emit.mlp
---- asmcomp/amd64/emit.mlp.orig
-+++ asmcomp/amd64/emit.mlp
-@@ -1034,7 +1034,7 @@ let begin_assembly() =
- | S_macosx -> D.section ["__TEXT";"__literal16"] None ["16byte_literals"]
- | S_mingw64 | S_cygwin -> D.section [".rdata"] (Some "dr") []
- | S_win64 -> D.data ()
-- | _ -> D.section [".rodata.cst8"] (Some "a") ["@progbits"]
-+ | _ -> D.section [".rodata.cst16"] (Some "aM") ["@progbits";"16"]
- end;
- D.align 16;
- _label (emit_symbol "caml_negf_mask");
-@@ -1094,8 +1094,9 @@ let end_assembly() =
- | S_macosx -> D.section ["__TEXT";"__literal8"] None ["8byte_literals"]
- | S_mingw64 | S_cygwin -> D.section [".rdata"] (Some "dr") []
- | S_win64 -> D.data ()
-- | _ -> D.section [".rodata.cst8"] (Some "a") ["@progbits"]
-+ | _ -> D.section [".rodata.cst8"] (Some "aM") ["@progbits";"8"]
- end;
-+ D.align 8;
- List.iter (fun (cst,lbl) -> emit_float_constant cst lbl) !float_constants
- end;
-
Index: lang/ocaml/patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/lang/ocaml/patches/patch-configure_ac,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-configure_ac
--- lang/ocaml/patches/patch-configure_ac 9 Jun 2020 17:34:14 -0000 1.3
+++ lang/ocaml/patches/patch-configure_ac 29 Nov 2021 19:41:47 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2020/
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -681,6 +681,11 @@ AS_CASE([$CC,$host],
+@@ -700,6 +700,11 @@ AS_CASE([$CC,$host],
)
@@ -15,7 +15,7 @@ Index: configure.ac
## Program to use to install files
AC_PROG_INSTALL
-@@ -797,8 +802,8 @@ AS_IF([test x"$enable_shared" != "xno"],
+@@ -824,8 +829,8 @@ AS_IF([test x"$enable_shared" != "xno"],
[[*-*-linux*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\
|*-*-openbsd*|*-*-netbsd*|*-*-dragonfly*|*-*-gnu*|*-*-haiku*]],
[sharedlib_cflags="-fPIC"
Index: lang/ocaml/patches/patch-runtime_amd64_S
===================================================================
RCS file: lang/ocaml/patches/patch-runtime_amd64_S
diff -N lang/ocaml/patches/patch-runtime_amd64_S
--- lang/ocaml/patches/patch-runtime_amd64_S 15 Mar 2021 20:47:23 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-runtime_amd64_S,v 1.1 2021/03/15 20:47:23 naddy Exp $
-
-Fix mergeable section flags and use .rodata.cst16 where appropriate
-https://github.com/ocaml/ocaml/commit/8a46d76bf9359b5cc505b3f2f9c81eb624c631fa
-
-Index: runtime/amd64.S
---- runtime/amd64.S.orig
-+++ runtime/amd64.S
-@@ -809,7 +809,7 @@ G(caml_system__spacetime_shapes):
- #elif defined(SYS_mingw64) || defined(SYS_cygwin)
- .section .rdata,"dr"
- #else
-- .section .rodata.cst8,"a",@progbits
-+ .section .rodata.cst16,"aM",@progbits,16
-
No comments:
Post a Comment