Merge branch 'master' into deprecate-ubuntu-23-04

Author: mtelvers

CHANGES.md

@@ -2,6 +2,8 @@ unreleased
 ----------
 
 - Deprecate Ubuntu 23.04. (@punchagan, #213)
+- Deprecate Fedora 38. (@mtelvers, #211)
+- Deprecate Debian 10. (@shonfeder, #210)
 - Add Ubuntu 24.04. (@mtelvers, #205)
 - Add Fedora 40, deprecate Fedora 37. (@mtelvers, #203)
 - Add Fedora 39. (@MisterDA #200)

src-opam/distro.ml

@@ -385,16 +385,16 @@ let distro_status (d : t) : status =
     | `Archlinux `Latest -> `Active `Tier3
     | `CentOS `V7 -> `Active `Tier3
     | `CentOS (`V6 | `V8) -> `Deprecated
-    | `Debian (`V7 | `V8 | `V9) -> `Deprecated
-    | `Debian (`V10 | `V11) -> `Active `Tier2
+    | `Debian (`V7 | `V8 | `V9 | `V10) -> `Deprecated
+    | `Debian `V11 -> `Active `Tier2
     | `Debian `V12 -> `Active `Tier1
     | `Debian `Testing -> `Active `Tier3
     | `Debian `Unstable -> `Active `Tier3
     | `Fedora
         ( `V21 | `V22 | `V23 | `V24 | `V25 | `V26 | `V27 | `V28 | `V29 | `V30
-        | `V31 | `V32 | `V33 | `V34 | `V35 | `V36 | `V37 ) ->
+        | `V31 | `V32 | `V33 | `V34 | `V35 | `V36 | `V37 | `V38 ) ->
         `Deprecated
-    | `Fedora (`V38 | `V39 | `V40) -> `Active `Tier2
+    | `Fedora (`V39 | `V40) -> `Active `Tier2
     | `OracleLinux `V7 -> `Deprecated
     | `OracleLinux (`V8 | `V9) -> `Active `Tier3
     | `OpenSUSE

src-opam/opam.ml

@@ -53,27 +53,20 @@ let install_opam_from_source ?(add_default_link = true) ?(prefix = "/usr/local")
 let install_opam_from_source_windows ?cyg ?prefix
     ?(enable_0install_solver = false) ?(with_vendored_deps = false)
     ?(msvs = false) ~branch ~hash () =
-  (* Although opam's readme states it can autodetec the environment
-     with MSVS, it doesn't always work. It's set explicitly here. *)
-  let msvs_env =
-    {|eval $(msvs-detect --arch=x64) && export PATH="$MSVS_PATH:$PATH" && export LIB="$MSVS_LIB" && export INCLUDE="$MSVS_INC" && |}
-  and ocaml_port = "OCAML_PORT=msvc64 " in
   Windows.Cygwin.run_sh ?cyg
     "cd /tmp/opam-sources && cp -P -R -p . ../opam-build-%s && cd \
      ../opam-build-%s && git checkout %s && git config --global --add \
      safe.directory /tmp/opam-build-%s"
     branch branch hash branch
+  @@ Windows.Cygwin.run_sh ?cyg "cd /tmp/opam-build-%s && make compiler %s"
+       branch
+       (if msvs then "OCAML_PORT=msvc64" else "")
   @@ Windows.Cygwin.run_sh ?cyg
-       "cd /tmp/opam-build-%s && %smake compiler %s&& make lib-pkg" branch
-       (if msvs then msvs_env else "")
-       (if msvs then ocaml_port else "")
-  @@ Windows.Cygwin.run_sh ?cyg
-       "cd /tmp/opam-build-%s && %s./configure --enable-cold-check %s%s%s%s && \
+       "cd /tmp/opam-build-%s && ./configure --enable-cold-check %s%s%s%s && \
         make && make install"
        branch
-       (if msvs then msvs_env else "")
        (if msvs then "" else "--with-private-runtime")
-       (if with_vendored_deps then "" else "--with-vendored_deps")
+       (if with_vendored_deps then " --with-vendored_deps" else "")
        (Option.fold prefix ~none:"" ~some:(fun prefix ->
             Printf.sprintf {| --prefix="%s"|} prefix))
        (if enable_0install_solver then " --with-0install-solver" else "")