Merge pull request #681 from psafont/up

Makefile

@@ -14,13 +14,14 @@ archive: $(NAME).tar.gz
 
 $(NAME).tar.gz:
 	# Add only upstream and xs pkgs into cache, add ocaml ones to metadata
-	mkdir -p stash
-	mv packages/{ocaml,upstream-extra,xs-extra,xs-extra-dummy} stash
-	env OPAMFETCH=wget opam admin cache |& tee cache.log
+	mkdir -p stash/ocaml
+	mv packages/{upstream-extra,xs-extra,xs-extra-dummy} stash
+	mv packages/ocaml/ocaml-base-compiler.* stash/ocaml
+	env OPAMFETCH=curl opam admin cache |& tee cache.log
 	! grep ERROR cache.log
-	mv stash/ocaml packages/
 	tar zcf $@ --transform "flags=r;s|^|$(NAME)/|" cache packages tools repo
-	mv stash/* packages/
+	cp -R stash/* packages/
+	rm -R stash/
 
 # report licenses of xs-toolstack from *installed* packages
 licenses:

packages/ocaml/base-bigarray.base/opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
+name: "base-bigarray"
+version: "base"
+synopsis: ""
+description: "Bigarray library distributed with the OCaml compiler"
 maintainer: "https://github.com/ocaml/opam-repository/issues"
-description: """
-Bigarray library distributed with the OCaml compiler
-"""
-

packages/ocaml/base-bytes.base/opam

@@ -1,9 +1,11 @@
 opam-version: "2.0"
+name: "base-bytes"
+version: "base"
+synopsis: "Bytes library distributed with the OCaml compiler"
 maintainer: " "
 authors: " "
 homepage: " "
 depends: [
   "ocaml" {>= "4.02.0"}
   "ocamlfind" {>= "1.5.3"}
 ]
-synopsis: "Bytes library distributed with the OCaml compiler"

packages/ocaml/base-threads.base/opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
+name: "base-threads"
+version: "base"
+synopsis: ""
+description: "Threads library distributed with the OCaml compiler"
 maintainer: "https://github.com/ocaml/opam-repository/issues"
-description: """
-Threads library distributed with the OCaml compiler
-"""
-

packages/ocaml/base-unix.base/opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
+name: "base-unix"
+version: "base"
+synopsis: ""
+description: "Unix library distributed with the OCaml compiler"
 maintainer: "https://github.com/ocaml/opam-repository/issues"
-description: """
-Unix library distributed with the OCaml compiler
-"""
-

packages/ocaml/host-arch-x86_64.1/opam

@@ -0,0 +1,19 @@
+opam-version: "2.0"
+name: "host-arch-x86_64"
+version: "1"
+synopsis: "OCaml on amd64 (64-bit)"
+description: """\
+This package is installed if the underlying OCaml compiler is for
+64-bit Intel x86 (x86_64/amd64/x64).
+
+Precisely, this means `ocamlopt -config-var architecture` equals `amd64`.
+
+This package may be used in depends or conflicts fields of dependent packages
+to indicate either a requirement or an incompatibility with this
+architecture."""
+maintainer: "David Allsopp <[email protected]>"
+authors: "David Allsopp"
+license: "CC0-1.0+"
+homepage: "https://opam.ocaml.org"
+bug-reports: "https://github.com/ocaml/opam-repository/issues"
+conflict-class: "ocaml-host-arch"

packages/ocaml/host-system-other.1/opam

@@ -0,0 +1,17 @@
+opam-version: "2.0"
+name: "host-system-other"
+version: "1"
+synopsis: "OCaml on an unidentified system"
+description: """\
+This package is installed if the underlying OCaml compiler's system is not
+recognised by opam-repository's compiler packaging.
+
+It is not expected that this package be used in depends or conflicts fields of
+dependent packages, given that its use may be changed if the packaging is
+subsequently enhanced to recognise the system value."""
+maintainer: "David Allsopp <[email protected]>"
+authors: "David Allsopp"
+license: "CC0-1.0+"
+homepage: "https://opam.ocaml.org"
+bug-reports: "https://github.com/ocaml/opam-repository/issues"
+conflict-class: "ocaml-host-system"

packages/ocaml/ocaml-base-compiler.4.14.1/opam

@@ -2,7 +2,10 @@ opam-version: "2.0"
 name: "ocaml-base-compiler"
 version: "4.14.1"
 synopsis: "Official release 4.14.1"
-maintainer: "[email protected]"
+maintainer: [
+  "David Allsopp <[email protected]>"
+  "Florian Angeletti <[email protected]>"
+]
 authors: "Xavier Leroy and many contributors"
 license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
 homepage: "https://ocaml.org"
@@ -12,23 +15,56 @@ depends: [
   "base-unix" {post}
   "base-bigarray" {post}
   "base-threads" {post}
+  "host-arch-arm32" {arch = "arm32" & post}
+  "host-arch-arm64" {arch = "arm64" & post}
+  "host-arch-ppc64" {arch = "ppc64" & post}
+  "host-arch-riscv64" {arch = "riscv64" & post}
+  "host-arch-s390x" {arch = "s390x" & post}
+  "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
+  "host-arch-x86_64" {os != "win32" & arch = "x86_64" & post}
+  "host-arch-unknown"
+    {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" &
+     arch != "riscv64" &
+     arch != "s390x" &
+     arch != "x86_32" &
+     arch != "x86_64" &
+     post}
+  (("arch-x86_64" {os = "win32" & arch = "x86_64"} &
+    (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
+     "system-msvc")) |
+   ("arch-x86_32" {os = "win32"} &
+    (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
+     "system-msvc")) |
+   "host-system-other" {os != "win32" & post})
   "ocaml-options-vanilla" {post}
+  "flexdll" {>= "0.36" & os = "win32"}
 ]
 conflict-class: "ocaml-core-compiler"
 flags: compiler
 setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"
 build: [
   [
     "./configure"
+    "--host=x86_64-pc-windows"
+      {system-msvc:installed & arch-x86_64:installed}
+    "--host=x86_64-w64-mingw32"
+      {os-distribution = "cygwin" & system-mingw:installed &
+       arch-x86_64:installed}
+    "--host=i686-pc-windows" {system-msvc:installed & arch-x86_32:installed}
+    "--host=i686-w64-mingw32"
+      {os-distribution = "cygwin" & system-mingw:installed &
+       arch-x86_32:installed}
     "--prefix=%{prefix}%"
     "--docdir=%{doc}%/ocaml"
+    "--with-flexdll=%{flexdll:share}%" {os = "win32" & flexdll:installed}
     "-C"
     "CC=cc" {os = "openbsd" | os = "macos"}
     "ASPP=cc -c" {os = "openbsd" | os = "macos"}
   ]
   [make "-j%{jobs}%"]
 ]
 install: [make "install"]
+build-env: MSYS2_ARG_CONV_EXCL = "*"
 post-messages: [
   """\
 A failure in the middle of the build may be caused by build parallelism
@@ -40,12 +76,20 @@ You can try installing again including --jobs=1
    to force a sequential build instead."""
     {failure & jobs > "1" & opam-version >= "2.0.5"}
 ]
-dev-repo: "git+https://github.com/ocaml/ocaml"
-extra-files: [
-  "ocaml-base-compiler.install" "md5=3e969b841df1f51ca448e6e6295cb451"
-]
+dev-repo: "git+https://github.com/ocaml/ocaml#4.14"
 url {
   src: "https://github.com/ocaml/ocaml/archive/4.14.1.tar.gz"
   checksum:
     "sha256=776006e6f0b9bcfb6d9d74381c588e587432ca85562fde93bb80472a5145b028"
 }
+extra-source "ocaml-base-compiler.install" {
+  src:
+    "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/ocaml-base-compiler/ocaml-base-compiler.install"
+  checksum: [
+    "sha256=79f2a1a5044a91350a0eb6ce12e261a72a2855c094c425cddf3860e58c486678"
+    "md5=3e969b841df1f51ca448e6e6295cb451"
+  ]
+}
+x-env-path-rewrite: [
+  [CAML_LD_LIBRARY_PATH (";" {os = "win32"} ":" {os != "win32"}) "target"]
+]

packages/ocaml/ocaml-base-compiler.4.14.2/opam

@@ -2,7 +2,10 @@ opam-version: "2.0"
 name: "ocaml-base-compiler"
 version: "4.14.2"
 synopsis: "Official release 4.14.2"
-maintainer: "[email protected]"
+maintainer: [
+  "David Allsopp <[email protected]>"
+  "Florian Angeletti <[email protected]>"
+]
 authors: "Xavier Leroy and many contributors"
 license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
 homepage: "https://ocaml.org"
@@ -12,23 +15,56 @@ depends: [
   "base-unix" {post}
   "base-bigarray" {post}
   "base-threads" {post}
+  "host-arch-arm32" {arch = "arm32" & post}
+  "host-arch-arm64" {arch = "arm64" & post}
+  "host-arch-ppc64" {arch = "ppc64" & post}
+  "host-arch-riscv64" {arch = "riscv64" & post}
+  "host-arch-s390x" {arch = "s390x" & post}
+  "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
+  "host-arch-x86_64" {os != "win32" & arch = "x86_64" & post}
+  "host-arch-unknown"
+    {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" &
+     arch != "riscv64" &
+     arch != "s390x" &
+     arch != "x86_32" &
+     arch != "x86_64" &
+     post}
+  (("arch-x86_64" {os = "win32" & arch = "x86_64"} &
+    (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
+     "system-msvc")) |
+   ("arch-x86_32" {os = "win32"} &
+    (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
+     "system-msvc")) |
+   "host-system-other" {os != "win32" & post})
   "ocaml-options-vanilla" {post}
+  "flexdll" {>= "0.36" & os = "win32"}
 ]
 conflict-class: "ocaml-core-compiler"
 flags: compiler
 setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"
 build: [
   [
     "./configure"
+    "--host=x86_64-pc-windows"
+      {system-msvc:installed & arch-x86_64:installed}
+    "--host=x86_64-w64-mingw32"
+      {os-distribution = "cygwin" & system-mingw:installed &
+       arch-x86_64:installed}
+    "--host=i686-pc-windows" {system-msvc:installed & arch-x86_32:installed}
+    "--host=i686-w64-mingw32"
+      {os-distribution = "cygwin" & system-mingw:installed &
+       arch-x86_32:installed}
     "--prefix=%{prefix}%"
     "--docdir=%{doc}%/ocaml"
+    "--with-flexdll=%{flexdll:share}%" {os = "win32" & flexdll:installed}
     "-C"
     "CC=cc" {os = "openbsd" | os = "macos"}
     "ASPP=cc -c" {os = "openbsd" | os = "macos"}
   ]
   [make "-j%{jobs}%"]
 ]
 install: [make "install"]
+build-env: MSYS2_ARG_CONV_EXCL = "*"
 post-messages: [
   """\
 A failure in the middle of the build may be caused by build parallelism
@@ -40,12 +76,20 @@ You can try installing again including --jobs=1
    to force a sequential build instead."""
     {failure & jobs > "1" & opam-version >= "2.0.5"}
 ]
-dev-repo: "git+https://github.com/ocaml/ocaml"
-extra-files: [
-  "ocaml-base-compiler.install" "md5=3e969b841df1f51ca448e6e6295cb451"
-]
+dev-repo: "git+https://github.com/ocaml/ocaml#4.14"
 url {
   src: "https://github.com/ocaml/ocaml/archive/4.14.2.tar.gz"
   checksum:
     "sha256=c2d706432f93ba85bd3383fa451d74543c32a4e84a1afaf3e8ace18f7f097b43"
 }
+extra-source "ocaml-base-compiler.install" {
+  src:
+    "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/ocaml-base-compiler/ocaml-base-compiler.install"
+  checksum: [
+    "sha256=79f2a1a5044a91350a0eb6ce12e261a72a2855c094c425cddf3860e58c486678"
+    "md5=3e969b841df1f51ca448e6e6295cb451"
+  ]
+}
+x-env-path-rewrite: [
+  [CAML_LD_LIBRARY_PATH (";" {os = "win32"} ":" {os != "win32"}) "target"]
+]