Skip to content

Commit 125afe5

Browse files
psafontpsafont
authored
Merge pull request #681 from psafont/up
2 parents 8c85c11 + 280a7da commit 125afe5

File tree

121 files changed

+765
-1106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+765
-1106
lines changed

‎Makefile

+6-5
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ archive: $(NAME).tar.gz
1414

1515
$(NAME).tar.gz:
1616
# Add only upstream and xs pkgs into cache, add ocaml ones to metadata
17-
mkdir -p stash
18-
mv packages/{ocaml,upstream-extra,xs-extra,xs-extra-dummy} stash
19-
env OPAMFETCH=wget opam admin cache |& tee cache.log
17+
mkdir -p stash/ocaml
18+
mv packages/{upstream-extra,xs-extra,xs-extra-dummy} stash
19+
mv packages/ocaml/ocaml-base-compiler.* stash/ocaml
20+
env OPAMFETCH=curl opam admin cache |& tee cache.log
2021
! grep ERROR cache.log
21-
mv stash/ocaml packages/
2222
tar zcf $@ --transform "flags=r;s|^|$(NAME)/|" cache packages tools repo
23-
mv stash/* packages/
23+
cp -R stash/* packages/
24+
rm -R stash/
2425

2526
# report licenses of xs-toolstack from *installed* packages
2627
licenses:

‎packages/ocaml/base-bigarray.base/opam

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
opam-version: "2.0"
2+
name: "base-bigarray"
3+
version: "base"
4+
synopsis: ""
5+
description: "Bigarray library distributed with the OCaml compiler"
26
maintainer: "https://github.com/ocaml/opam-repository/issues"
3-
description: """
4-
Bigarray library distributed with the OCaml compiler
5-
"""
6-

‎packages/ocaml/base-bytes.base/opam

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
opam-version: "2.0"
2+
name: "base-bytes"
3+
version: "base"
4+
synopsis: "Bytes library distributed with the OCaml compiler"
25
maintainer: " "
36
authors: " "
47
homepage: " "
58
depends: [
69
"ocaml" {>= "4.02.0"}
710
"ocamlfind" {>= "1.5.3"}
811
]
9-
synopsis: "Bytes library distributed with the OCaml compiler"

‎packages/ocaml/base-threads.base/opam

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
opam-version: "2.0"
2+
name: "base-threads"
3+
version: "base"
4+
synopsis: ""
5+
description: "Threads library distributed with the OCaml compiler"
26
maintainer: "https://github.com/ocaml/opam-repository/issues"
3-
description: """
4-
Threads library distributed with the OCaml compiler
5-
"""
6-

‎packages/ocaml/base-unix.base/opam

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
opam-version: "2.0"
2+
name: "base-unix"
3+
version: "base"
4+
synopsis: ""
5+
description: "Unix library distributed with the OCaml compiler"
26
maintainer: "https://github.com/ocaml/opam-repository/issues"
3-
description: """
4-
Unix library distributed with the OCaml compiler
5-
"""
6-

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

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
opam-version: "2.0"
2+
name: "host-arch-x86_64"
3+
version: "1"
4+
synopsis: "OCaml on amd64 (64-bit)"
5+
description: """\
6+
This package is installed if the underlying OCaml compiler is for
7+
64-bit Intel x86 (x86_64/amd64/x64).
8+
9+
Precisely, this means `ocamlopt -config-var architecture` equals `amd64`.
10+
11+
This package may be used in depends or conflicts fields of dependent packages
12+
to indicate either a requirement or an incompatibility with this
13+
architecture."""
14+
maintainer: "David Allsopp <david@tarides.com>"
15+
authors: "David Allsopp"
16+
license: "CC0-1.0+"
17+
homepage: "https://opam.ocaml.org"
18+
bug-reports: "https://github.com/ocaml/opam-repository/issues"
19+
conflict-class: "ocaml-host-arch"

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

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
opam-version: "2.0"
2+
name: "host-system-other"
3+
version: "1"
4+
synopsis: "OCaml on an unidentified system"
5+
description: """\
6+
This package is installed if the underlying OCaml compiler's system is not
7+
recognised by opam-repository's compiler packaging.
8+
9+
It is not expected that this package be used in depends or conflicts fields of
10+
dependent packages, given that its use may be changed if the packaging is
11+
subsequently enhanced to recognise the system value."""
12+
maintainer: "David Allsopp <david@tarides.com>"
13+
authors: "David Allsopp"
14+
license: "CC0-1.0+"
15+
homepage: "https://opam.ocaml.org"
16+
bug-reports: "https://github.com/ocaml/opam-repository/issues"
17+
conflict-class: "ocaml-host-system"

‎packages/ocaml/ocaml-base-compiler.4.13.1/files/ocaml-base-compiler.install

-1
This file was deleted.

‎packages/ocaml/ocaml-base-compiler.4.13.1/opam

-43
This file was deleted.

‎packages/ocaml/ocaml-base-compiler.4.14.1/files/ocaml-base-compiler.install

-1
This file was deleted.

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

+49-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ opam-version: "2.0"
22
name: "ocaml-base-compiler"
33
version: "4.14.1"
44
synopsis: "Official release 4.14.1"
5-
maintainer: "platform@lists.ocaml.org"
5+
maintainer: [
6+
"David Allsopp <david@tarides.com>"
7+
"Florian Angeletti <florian.angeletti@inria.fr>"
8+
]
69
authors: "Xavier Leroy and many contributors"
710
license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
811
homepage: "https://ocaml.org"
@@ -12,23 +15,56 @@ depends: [
1215
"base-unix" {post}
1316
"base-bigarray" {post}
1417
"base-threads" {post}
18+
"host-arch-arm32" {arch = "arm32" & post}
19+
"host-arch-arm64" {arch = "arm64" & post}
20+
"host-arch-ppc64" {arch = "ppc64" & post}
21+
"host-arch-riscv64" {arch = "riscv64" & post}
22+
"host-arch-s390x" {arch = "s390x" & post}
23+
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
24+
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post}
25+
"host-arch-unknown"
26+
{os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" &
27+
arch != "riscv64" &
28+
arch != "s390x" &
29+
arch != "x86_32" &
30+
arch != "x86_64" &
31+
post}
32+
(("arch-x86_64" {os = "win32" & arch = "x86_64"} &
33+
(("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
34+
"system-msvc")) |
35+
("arch-x86_32" {os = "win32"} &
36+
(("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
37+
"system-msvc")) |
38+
"host-system-other" {os != "win32" & post})
1539
"ocaml-options-vanilla" {post}
40+
"flexdll" {>= "0.36" & os = "win32"}
1641
]
1742
conflict-class: "ocaml-core-compiler"
1843
flags: compiler
1944
setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"
2045
build: [
2146
[
2247
"./configure"
48+
"--host=x86_64-pc-windows"
49+
{system-msvc:installed & arch-x86_64:installed}
50+
"--host=x86_64-w64-mingw32"
51+
{os-distribution = "cygwin" & system-mingw:installed &
52+
arch-x86_64:installed}
53+
"--host=i686-pc-windows" {system-msvc:installed & arch-x86_32:installed}
54+
"--host=i686-w64-mingw32"
55+
{os-distribution = "cygwin" & system-mingw:installed &
56+
arch-x86_32:installed}
2357
"--prefix=%{prefix}%"
2458
"--docdir=%{doc}%/ocaml"
59+
"--with-flexdll=%{flexdll:share}%" {os = "win32" & flexdll:installed}
2560
"-C"
2661
"CC=cc" {os = "openbsd" | os = "macos"}
2762
"ASPP=cc -c" {os = "openbsd" | os = "macos"}
2863
]
2964
[make "-j%{jobs}%"]
3065
]
3166
install: [make "install"]
67+
build-env: MSYS2_ARG_CONV_EXCL = "*"
3268
post-messages: [
3369
"""\
3470
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
4076
to force a sequential build instead."""
4177
{failure & jobs > "1" & opam-version >= "2.0.5"}
4278
]
43-
dev-repo: "git+https://github.com/ocaml/ocaml"
44-
extra-files: [
45-
"ocaml-base-compiler.install" "md5=3e969b841df1f51ca448e6e6295cb451"
46-
]
79+
dev-repo: "git+https://github.com/ocaml/ocaml#4.14"
4780
url {
4881
src: "https://github.com/ocaml/ocaml/archive/4.14.1.tar.gz"
4982
checksum:
5083
"sha256=776006e6f0b9bcfb6d9d74381c588e587432ca85562fde93bb80472a5145b028"
5184
}
85+
extra-source "ocaml-base-compiler.install" {
86+
src:
87+
"https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/ocaml-base-compiler/ocaml-base-compiler.install"
88+
checksum: [
89+
"sha256=79f2a1a5044a91350a0eb6ce12e261a72a2855c094c425cddf3860e58c486678"
90+
"md5=3e969b841df1f51ca448e6e6295cb451"
91+
]
92+
}
93+
x-env-path-rewrite: [
94+
[CAML_LD_LIBRARY_PATH (";" {os = "win32"} ":" {os != "win32"}) "target"]
95+
]

‎packages/ocaml/ocaml-base-compiler.4.14.2/files/ocaml-base-compiler.install

-1
This file was deleted.

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

+49-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ opam-version: "2.0"
22
name: "ocaml-base-compiler"
33
version: "4.14.2"
44
synopsis: "Official release 4.14.2"
5-
maintainer: "platform@lists.ocaml.org"
5+
maintainer: [
6+
"David Allsopp <david@tarides.com>"
7+
"Florian Angeletti <florian.angeletti@inria.fr>"
8+
]
69
authors: "Xavier Leroy and many contributors"
710
license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
811
homepage: "https://ocaml.org"
@@ -12,23 +15,56 @@ depends: [
1215
"base-unix" {post}
1316
"base-bigarray" {post}
1417
"base-threads" {post}
18+
"host-arch-arm32" {arch = "arm32" & post}
19+
"host-arch-arm64" {arch = "arm64" & post}
20+
"host-arch-ppc64" {arch = "ppc64" & post}
21+
"host-arch-riscv64" {arch = "riscv64" & post}
22+
"host-arch-s390x" {arch = "s390x" & post}
23+
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
24+
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post}
25+
"host-arch-unknown"
26+
{os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" &
27+
arch != "riscv64" &
28+
arch != "s390x" &
29+
arch != "x86_32" &
30+
arch != "x86_64" &
31+
post}
32+
(("arch-x86_64" {os = "win32" & arch = "x86_64"} &
33+
(("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
34+
"system-msvc")) |
35+
("arch-x86_32" {os = "win32"} &
36+
(("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
37+
"system-msvc")) |
38+
"host-system-other" {os != "win32" & post})
1539
"ocaml-options-vanilla" {post}
40+
"flexdll" {>= "0.36" & os = "win32"}
1641
]
1742
conflict-class: "ocaml-core-compiler"
1843
flags: compiler
1944
setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"
2045
build: [
2146
[
2247
"./configure"
48+
"--host=x86_64-pc-windows"
49+
{system-msvc:installed & arch-x86_64:installed}
50+
"--host=x86_64-w64-mingw32"
51+
{os-distribution = "cygwin" & system-mingw:installed &
52+
arch-x86_64:installed}
53+
"--host=i686-pc-windows" {system-msvc:installed & arch-x86_32:installed}
54+
"--host=i686-w64-mingw32"
55+
{os-distribution = "cygwin" & system-mingw:installed &
56+
arch-x86_32:installed}
2357
"--prefix=%{prefix}%"
2458
"--docdir=%{doc}%/ocaml"
59+
"--with-flexdll=%{flexdll:share}%" {os = "win32" & flexdll:installed}
2560
"-C"
2661
"CC=cc" {os = "openbsd" | os = "macos"}
2762
"ASPP=cc -c" {os = "openbsd" | os = "macos"}
2863
]
2964
[make "-j%{jobs}%"]
3065
]
3166
install: [make "install"]
67+
build-env: MSYS2_ARG_CONV_EXCL = "*"
3268
post-messages: [
3369
"""\
3470
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
4076
to force a sequential build instead."""
4177
{failure & jobs > "1" & opam-version >= "2.0.5"}
4278
]
43-
dev-repo: "git+https://github.com/ocaml/ocaml"
44-
extra-files: [
45-
"ocaml-base-compiler.install" "md5=3e969b841df1f51ca448e6e6295cb451"
46-
]
79+
dev-repo: "git+https://github.com/ocaml/ocaml#4.14"
4780
url {
4881
src: "https://github.com/ocaml/ocaml/archive/4.14.2.tar.gz"
4982
checksum:
5083
"sha256=c2d706432f93ba85bd3383fa451d74543c32a4e84a1afaf3e8ace18f7f097b43"
5184
}
85+
extra-source "ocaml-base-compiler.install" {
86+
src:
87+
"https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/ocaml-base-compiler/ocaml-base-compiler.install"
88+
checksum: [
89+
"sha256=79f2a1a5044a91350a0eb6ce12e261a72a2855c094c425cddf3860e58c486678"
90+
"md5=3e969b841df1f51ca448e6e6295cb451"
91+
]
92+
}
93+
x-env-path-rewrite: [
94+
[CAML_LD_LIBRARY_PATH (";" {os = "win32"} ":" {os != "win32"}) "target"]
95+
]

‎packages/ocaml/ocaml-config.2/files/gen_ocaml_config.ml.in

-56
This file was deleted.

0 commit comments

Comments
 (0)