CVS commit: pkgsrc/lang/ocaml

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr  9 07:27:48 UTC 2023

Modified Files:
        pkgsrc/lang/ocaml: Makefile.common distinfo
        pkgsrc/lang/ocaml/patches: patch-otherlibs_systhreads_Makefile
Removed Files:
        pkgsrc/lang/ocaml/patches: patch-Makefile.build_config.in

Log Message:
ocaml: update to 4.14.1.

OCaml 4.14.1 (20 December 2022)
------------------------------

### Bug fixes:

- #11803, #11808: on x86, the destination of an integer comparison must be
  a register, it cannot be a stack slot.
  (Vincent Laviron, review by Xavier Leroy, report by
   Emilio Jesús Gallego Arias)

OCaml 4.14.1
-----------------------------

### Compiler user-interface and warnings:

- #11184, #11670: Stop calling ranlib on created / installed libraries
  (Sébastien Hinderer and Xavier Leroy, review by the same)

### Build system:

- #11370, #11373: Don't pass CFLAGS to flexlink during configure.
  (David Allsopp, report by William Hu, review by Xavier Leroy and
   Sébastien Hinderer)

- #11487: Thwart FMA test optimization during configure
  (William Hu, review by David Allsopp and Sébastien Hinderer)

### Bug fixes:

- #10768, #11340: Fix typechecking regression when combining first class
  modules and GADTs.
  (Jacques Garrigue, report by François Thiré, review by Matthew Ryan)

- #11204: Fix regression introduced in 4.14.0 that would trigger Warning 17 when
  calling virtual methods introduced by constraining the self type from within
  the class definition.
  (Nicolás Ojeda Bär, review by Leo White)

- #11263, #11267: caml/{memory,misc}.h: check whether `_MSC_VER` is defined
  before using it to ensure that the headers can always be used in code which
  turns on -Wundef (or equivalent).
  (David Allsopp and Nicolás Ojeda Bär, review by Nicolás Ojeda Bär and
   Sébastien Hinderer)

- #11314, #11416: fix non-informative error message for module inclusion
  (Florian Angeletti, report by Thierry Martinez, review by Gabriel Scherer)

- #11358, #11379: Refactor the initialization of bytecode threading,
  This avoids a "dangling pointer" warning of GCC 12.1.
  (Xavier Leroy, report by Armaël Guéneau, review by Gabriel Scherer)

- #11387, module type with constraints no longer crash the compiler in presence
  of both shadowing warnings and the `-bin-annot` compiler flag.
  (Florian Angeletti, report by Christophe Raffalli, review by Gabriel Scherer)

- #11392, #11392: assertion failure with -rectypes and external definitions
  (Gabriel Scherer, review by Florian Angeletti, report by Dmitrii Kosarev)

- #11417: Fix regression allowing virtual methods in non-virtual classes.
  (Leo White, review by Florian Angeletti)

- #11468: Fix regression from #10186 (OCaml 4.13) detecting IPv6 on Windows for
  mingw-w64 i686 port.
  (David Allsopp, review by Xavier Leroy and Sébastien Hinderer)

- #11489, #11496: More prudent deallocation of alternate signal stack
  (Xavier Leroy, report by @rajdakin, review by Florian Angeletti)

- #11516, #11524: Fix the `deprecated_mutable` attribute.
  (Chris Casinghino, review by Nicolás Ojeda Bär and Florian Angeletti)

- #11194, #11609: Fix inconsistent type variable names in "unbound type var"
  messages
  (Ulysse Gérard and Florian Angeletti, review Florian Angeletti and
   Gabriel Scherer)

- #11622: Prevent stack overflow when printing a constructor or record
  mismatch error involving recursive types.
  (Florian Angeletti, review by Gabriel Scherer)

- #11732: Ensure that types from packed modules are always generalised
  (Stephen Dolan and Leo White, review by Jacques Garrigue)

- #11737: Fix segfault condition in Unix.stat under Windows in the presence of
  multiple threads.
  (Marc Lasson, Nicolás Ojeda Bär, review by Gabriel Scherer and David Allsopp)

- #11776: Extend environment with functor parameters in `strengthen_lazy`.
  (Chris Casinghino and Luke Maurer, review by Gabriel Scherer)

- #11533, #11534: follow synonyms again in #show_module_type
  (this had stopped working in 4.14.0)
  (Gabriel Scherer, review by Jacques Garrigue, report by Yaron Minsky)

- #11768, #11788: Fix crash at start-up of bytecode programs in
  no-naked-pointers mode caused by wrong initialization of caml_global_data
  (Xavier Leroy, report by Etienne Millon, review by Gabriel Scherer)


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/lang/ocaml/Makefile.common
cvs rdiff -u -r1.145 -r1.146 pkgsrc/lang/ocaml/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/ocaml/patches/patch-Makefile.build_config.in
cvs rdiff -u -r1.13 -r1.14 \
    pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ocaml/Makefile.common
diff -u pkgsrc/lang/ocaml/Makefile.common:1.64 pkgsrc/lang/ocaml/Makefile.common:1.65
--- pkgsrc/lang/ocaml/Makefile.common:1.64      Tue May 24 18:25:38 2022
+++ pkgsrc/lang/ocaml/Makefile.common   Sun Apr  9 07:27:48 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.64 2022/05/24 18:25:38 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.65 2023/04/09 07:27:48 wiz Exp $
 
 # used by x11/labltk/Makefile
-DISTNAME=      ocaml-4.14.0
+DISTNAME=      ocaml-4.14.1
 CATEGORIES=    lang
 MASTER_SITES=  http://caml.inria.fr/pub/distrib/ocaml-4.14/
 #EXTRACT_SUFX= .tar.bz2
@@ -14,6 +14,11 @@ LICENSE=     gnu-gpl-v2
 USE_LANGUAGES+=                c99
 USE_TOOLS+=            gmake
 GNU_CONFIGURE=         yes
+
+MAKE_FLAGS+=           INSTALL=${INSTALL:Q}
+MAKE_FLAGS+=           INSTALL_DATA=${INSTALL_DATA:Q}
+MAKE_FLAGS+=           INSTALL_PROG=${INSTALL_SCRIPT:Q}
+
 #CONFIGURE_ENV+=       BDB_LIBS=${BDB_LINK:Q}
 #CONFIGURE_ENV+=       BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q}
 #CONFIGURE_ENV+=       LDFLAGS=${LDFLAGS:Q}

Index: pkgsrc/lang/ocaml/distinfo
diff -u pkgsrc/lang/ocaml/distinfo:1.145 pkgsrc/lang/ocaml/distinfo:1.146
--- pkgsrc/lang/ocaml/distinfo:1.145    Tue May 24 18:25:38 2022
+++ pkgsrc/lang/ocaml/distinfo  Sun Apr  9 07:27:48 2023
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.145 2022/05/24 18:25:38 jaapb Exp $
+$NetBSD: distinfo,v 1.146 2023/04/09 07:27:48 wiz Exp $
 
-BLAKE2s (ocaml-4.14.0.tar.gz) = 07f8e81765693d73c5b9326da424df67c9281a5e04fc6ca0f2539935fdc96d2c
-SHA512 (ocaml-4.14.0.tar.gz) = 84cd7fd96a4cde5f1063caae112629f37812add4ca2a888c56b3992b8d5528769c2ebc6b1b8f4a0b54e620f8450a7dbe11225f716e0f47cef0d3707457911ac0
-Size (ocaml-4.14.0.tar.gz) = 5492464 bytes
+BLAKE2s (ocaml-4.14.1.tar.gz) = 5ab5d0aba6f943ce314a69235171236dec6ec5e680afc18c8d1ee3be1db2fd2c
+SHA512 (ocaml-4.14.1.tar.gz) = 8fdeb1b370cb1f8a469a57966ac7dcb64814dd7c098a432c76bc61ba0f59d067e2b36aa29da9b86d048738db230dc5d813b99d577cdeeb4b1aa18ee563528f60
+Size (ocaml-4.14.1.tar.gz) = 5497979 bytes
 SHA1 (patch-Makefile) = 978156d1e5795615adda840521bf5911a801f6a5
-SHA1 (patch-Makefile.build_config.in) = 9702fc3b8fa8f4e963f3e4a193439a12836af816
 SHA1 (patch-api__docgen_ocamldoc_Makefile) = cc677bed9d2da3d7eedd2c696ac89085bf2002d2
 SHA1 (patch-check-linker-version_sh) = c90242556207242ac58499d7f42519a10aedcca4
 SHA1 (patch-configure) = 36ddb6f19ce7564889dc48ee290904dce00b04ec
@@ -13,7 +12,7 @@ SHA1 (patch-man_Makefile) = 3d55fe512775
 SHA1 (patch-ocamldoc_Makefile) = 5431d357ecbe719efffeb14826a8d79f0590784e
 SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
 SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 5518c6b4d8772d995252b6f640323e2602097c4d
-SHA1 (patch-otherlibs_systhreads_Makefile) = 76b6619f43562d30be9a87fd450b75033f4aff0b
+SHA1 (patch-otherlibs_systhreads_Makefile) = 3505469ae2d3cafd7283e984ebbbea47b0d59b32
 SHA1 (patch-otherlibs_systhreads_st__stubs.c) = 3c0aa73f0e128646c01ed3855ee9c5645d5fa3f1
 SHA1 (patch-otherlibs_unix_Makefile) = 9eaf8d561670a765a647b36486ec533c674ee609
 SHA1 (patch-runtime_Makefile) = 4daf1ddb9ce70d99719bcb0aacbaadfc393574b0

Index: pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile:1.13 pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile:1.14
--- pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile:1.13  Tue May 24 18:25:38 2022
+++ pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile       Sun Apr  9 07:27:48 2023
@@ -1,9 +1,9 @@
-$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.13 2022/05/24 18:25:38 jaapb Exp $
+$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.14 2023/04/09 07:27:48 wiz Exp $
 
 Use BSD_INSTALL_* instead of mkdir
 Honor LDFLAGS.
 
---- otherlibs/systhreads/Makefile.orig 2021-09-30 15:40:11.000000000 +0000
+--- otherlibs/systhreads/Makefile.orig 2022-12-20 12:26:44.000000000 +0000
 +++ otherlibs/systhreads/Makefile
 @@ -30,6 +30,7 @@ NATIVE_CPPFLAGS = \
    -DNATIVE_CODE -DTARGET_$(ARCH) -DMODEL_$(MODEL) -DSYS_$(SYSTEM)
@@ -31,10 +31,10 @@ Honor LDFLAGS.
  # TODO: Figure out why -cclib -lunix is used here.
  # It may be because of the threadsUnix module which is deprecated.
  # It may hence be good to figure out whether this module shouldn't be
-@@ -122,7 +123,7 @@ install:
+@@ -121,7 +122,7 @@ install:
+         $(INSTALL_PROG) dllthreads$(EXT_DLL) "$(INSTALL_STUBLIBDIR)"; \
        fi
        $(INSTALL_DATA) libthreads.$(A) "$(INSTALL_LIBDIR)"
-       cd "$(INSTALL_LIBDIR)"; $(RANLIB) libthreads.$(A)
 -      mkdir -p "$(INSTALL_THREADSLIBDIR)"
 +      $(BSD_INSTALL_LIB_DIR) "$(INSTALL_THREADSLIBDIR)"
        $(INSTALL_DATA) \