Merge pull request ocaml#6189 from kit-ty-kate/win32-ocaml5

Fix Windows builds with OCaml >= 5.0

configure.ac

@@ -357,7 +357,12 @@ AS_CASE([${support_static},${enable_static}],
   [no,yes],[AC_MSG_ERROR([--enable-static is not available on this platform (${TARGET}).])],
   [*,auto],[enable_static=${default_static}])
 AS_IF([test "${enable_static}" = yes],[
-  echo "(-noautolink -cclib -lunix -cclib -lmccs_stubs -cclib -lmccs_glpk_stubs -cclib -lsha_stubs ${platform_dependent_stuff})" > src/client/linking.sexp
+  AX_COMPARE_VERSION([$OCAMLVERSION], [lt], [5.0.0],[
+    unix_lib_name=unix
+  ],[
+    unix_lib_name=unixnat
+  ])
+  echo "(-noautolink -cclib -l${unix_lib_name} -cclib -lmccs_stubs -cclib -lmccs_glpk_stubs -cclib -lsha_stubs ${platform_dependent_stuff})" > src/client/linking.sexp
   AC_MSG_RESULT([static])
 ],[
   AC_MSG_RESULT([shared])

master_changes.md

@@ -111,6 +111,7 @@ users)
   * Bump the vendored opam-0install-cudf to 0.5.0 [#6130 @kit-ty-kate]
   * Require opam-0install-cudf >= 0.5.0 [#6130 @kit-ty-kate]
   * Bump the vendored mccs to 1.1+18 [#6170 @kit-ty-kate]
+  * Fix Windows builds with OCaml >= 5.0 [#6189 @kit-ty-kate - fix #6148]
 
 ## Infrastructure
 

opam-core.opam

@@ -22,7 +22,7 @@ license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://opam.ocaml.org"
 bug-reports: "https://github.com/ocaml/opam/issues"
 depends: [
-  "ocaml" {>= "4.08.0" & (os != "win32" | < "5.0")}
+  "ocaml" {>= "4.08.0"}
   "base-unix"
   "ocamlgraph"
   "re" {>= "1.9.0"}

src/core/dune

@@ -19,6 +19,14 @@
 (rule
   (copy opamStubsTypes.ml opamStubsTypes.mli))
 
+(rule
+ (enabled_if (< %{ocaml_version} "5.0"))
+ (action (copy# opamStubs.ocaml4.ml opamStubs.win32.ml)))
+
+(rule
+ (enabled_if (>= %{ocaml_version} "5.0"))
+ (action (copy# opamStubs.ocaml5.ml opamStubs.win32.ml)))
+
 (rule
   (write-file opamCoreConfigDeveloper.ml
     "let value = \"%{read-strings:developer}\""))

src/core/opamStubs.ocaml5.ml

@@ -0,0 +1,17 @@
+(**************************************************************************)
+(*                                                                        *)
+(*    Copyright 2018 MetaStack Solutions Ltd.                             *)
+(*                                                                        *)
+(*  All rights reserved. This file is distributed under the terms of the  *)
+(*  GNU Lesser General Public License version 2.1, with the special       *)
+(*  exception on linking described in the file LICENSE.                   *)
+(*                                                                        *)
+(**************************************************************************)
+
+include OpamStubsTypes
+include OpamWin32Stubs
+let getpid () = Int32.to_int (getCurrentProcessID ())
+
+external win_create_process : string -> string -> string option ->
+                              Unix.file_descr -> Unix.file_descr -> Unix.file_descr -> int
+                            = "caml_unix_create_process" "caml_unix_create_process_native"