mrrl

commit 3e9e0001221d602eccdd54df292ffdea0f2029aa
parent ed9b9dbcb3f227b30f38cfaa40d3d37bcebec09e
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Tue,  4 Nov 2025 01:44:53 +0000

ocaml packages

Diffstat:
M
templates/pkg/ocaml-findlib
 | 
4
+++-
M
variants/ccx-x86_64/ocaml-astring
 | 
4
++--
M
variants/ccx-x86_64/ocaml-bos
 | 
8
++++----
M
variants/ccx-x86_64/ocaml-findlib
 | 
4
+++-
M
variants/ccx-x86_64/ocaml-rresult
 | 
4
++--
M
variants/ccx-x86_64/ocaml-topkg
 | 
2
+-
M
variants/ccx-x86_64/wip.environment
 | 
4
++--
M
variants/root-x86_64/ocaml-astring
 | 
4
++--
M
variants/root-x86_64/ocaml-bos
 | 
8
++++----
M
variants/root-x86_64/ocaml-findlib
 | 
4
+++-
M
variants/root-x86_64/ocaml-rresult
 | 
4
++--
M
variants/root-x86_64/ocaml-topkg
 | 
2
+-
M
variants/root-x86_64/wip.environment
 | 
4
++--

13 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/templates/pkg/ocaml-findlib b/templates/pkg/ocaml-findlib
@@ -28,7 +28,9 @@ make -j1 all opt
 {% endblock build %}
 {% block install -%}
 # workaround `topfind` getting installed to stdlib directory, this is not configurable
-ln -s "$pthbs_package" "$pthbs_destdir{{pkg_install_dir("ocaml")}}"
+stdlib="$pthbs_destdir{{pkg_install_dir("ocaml")}}"
+mkdir -p "${stdlib%/*}"
+ln -s "$pthbs_package" "$stdlib"
 make install prefix="$pthbs_destdir"
 
 {% endblock install %}
diff --git a/variants/ccx-x86_64/ocaml-astring b/variants/ccx-x86_64/ocaml-astring
@@ -5,10 +5,10 @@
 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8
 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f
 #+ocaml.b8790b4e31ab26a55165b60c745d8789addca32a91a851444cbf36abe8c19dc5
-#+ocaml-findlib.17e7dd92523f81671779b9a8cd70af19cd52da4c6869a427fed36af4a2e4532a
+#+ocaml-findlib.d510a8b1a69457f6550ee6fe9e7d5cb8b82b6e41eb758ec0ce46c9218fd40c60
 #+ocamlbuild.af1e7c1126b473143018d4844d1142ae30a23db6b8c435f28ba21bbe015b03f8
 #+opam.714997e34c97a27678ee9a24f03256bbda3ac9e44597b10f56c795f37a17e989
-#+ocaml-topkg.980b4538b54e744b4a3e65ba1b1693ea0ca2a8548f2a846428a7214bc5401cad
+#+ocaml-topkg.a181b5e74a01215f14686efec946d4ccd46577ed64c1040dcbeef951ec022b1a
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-bos b/variants/ccx-x86_64/ocaml-bos
@@ -5,12 +5,12 @@
 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8
 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f
 #+ocaml.b8790b4e31ab26a55165b60c745d8789addca32a91a851444cbf36abe8c19dc5
-#+ocaml-findlib.17e7dd92523f81671779b9a8cd70af19cd52da4c6869a427fed36af4a2e4532a
+#+ocaml-findlib.d510a8b1a69457f6550ee6fe9e7d5cb8b82b6e41eb758ec0ce46c9218fd40c60
 #+ocamlbuild.af1e7c1126b473143018d4844d1142ae30a23db6b8c435f28ba21bbe015b03f8
 #+opam.714997e34c97a27678ee9a24f03256bbda3ac9e44597b10f56c795f37a17e989
-#+ocaml-topkg.980b4538b54e744b4a3e65ba1b1693ea0ca2a8548f2a846428a7214bc5401cad
-#+ocaml-astring.b087c541e4c194bc3110449c663c2b7f27a5203d729b76f2e82929fb14ffcd04
-#+ocaml-rresult.93263b411bb73baed4a8ee58745bae93668b1d78b48352e22e47418c2424f784
+#+ocaml-topkg.a181b5e74a01215f14686efec946d4ccd46577ed64c1040dcbeef951ec022b1a
+#+ocaml-astring.8df6e02eb3f2c33432fc80965f99106420eea12ddffa42703b14d888c83a8a47
+#+ocaml-rresult.236d3b8cf5fbd410195c5a47b6b2e287c817ff0270cc804bf2dddeda5bca37dc
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib
@@ -45,7 +45,9 @@ cd 'findlib-1.9.8'
 make -j1 all opt
 
 # workaround `topfind` getting installed to stdlib directory, this is not configurable
-ln -s "$pthbs_package" "$pthbs_destdir/home/ccx/versions/ocaml.b8790b4e31ab26a55165b60c745d8789addca32a91a851444cbf36abe8c19dc5"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.b8790b4e31ab26a55165b60c745d8789addca32a91a851444cbf36abe8c19dc5"
+mkdir -p "${stdlib%/*}"
+ln -s "$pthbs_package" "$stdlib"
 make install prefix="$pthbs_destdir"
 
 
diff --git a/variants/ccx-x86_64/ocaml-rresult b/variants/ccx-x86_64/ocaml-rresult
@@ -5,10 +5,10 @@
 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8
 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f
 #+ocaml.b8790b4e31ab26a55165b60c745d8789addca32a91a851444cbf36abe8c19dc5
-#+ocaml-findlib.17e7dd92523f81671779b9a8cd70af19cd52da4c6869a427fed36af4a2e4532a
+#+ocaml-findlib.d510a8b1a69457f6550ee6fe9e7d5cb8b82b6e41eb758ec0ce46c9218fd40c60
 #+ocamlbuild.af1e7c1126b473143018d4844d1142ae30a23db6b8c435f28ba21bbe015b03f8
 #+opam.714997e34c97a27678ee9a24f03256bbda3ac9e44597b10f56c795f37a17e989
-#+ocaml-topkg.980b4538b54e744b4a3e65ba1b1693ea0ca2a8548f2a846428a7214bc5401cad
+#+ocaml-topkg.a181b5e74a01215f14686efec946d4ccd46577ed64c1040dcbeef951ec022b1a
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-topkg b/variants/ccx-x86_64/ocaml-topkg
@@ -5,7 +5,7 @@
 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8
 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f
 #+ocaml.b8790b4e31ab26a55165b60c745d8789addca32a91a851444cbf36abe8c19dc5
-#+ocaml-findlib.17e7dd92523f81671779b9a8cd70af19cd52da4c6869a427fed36af4a2e4532a
+#+ocaml-findlib.d510a8b1a69457f6550ee6fe9e7d5cb8b82b6e41eb758ec0ce46c9218fd40c60
 #+ocamlbuild.af1e7c1126b473143018d4844d1142ae30a23db6b8c435f28ba21bbe015b03f8
 #+opam.714997e34c97a27678ee9a24f03256bbda3ac9e44597b10f56c795f37a17e989
 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:.
diff --git a/variants/ccx-x86_64/wip.environment b/variants/ccx-x86_64/wip.environment
@@ -4,4 +4,4 @@
 #+ocamlbuild.af1e7c1126b473143018d4844d1142ae30a23db6b8c435f28ba21bbe015b03f8
 #+ocaml-base.6f21ed59c1615888f40f14b4362c60d1043053ba17c1be3fe604d54b69b82081
 #+opam.714997e34c97a27678ee9a24f03256bbda3ac9e44597b10f56c795f37a17e989
-#+ocaml-bos.8b0a8baba8f6f0197683a7fdf4c3932e426032b1bc600844ce3a154788ffb6a7-
\ No newline at end of file
+#+ocaml-bos.f8cff972735294605b9f2e14b36111114242754bf42f6c5c724fa12b49360dde+
\ No newline at end of file
diff --git a/variants/root-x86_64/ocaml-astring b/variants/root-x86_64/ocaml-astring
@@ -5,10 +5,10 @@
 #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc
 #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676
 #+ocaml.4b14d5c50c08207a0442af369f9995a12f6a15db8d8b0fd5247a982789fc3090
-#+ocaml-findlib.da3c6e8cdab92fdea8305b1438434afbb9e70579f26ed2a3e81059c03a6ce386
+#+ocaml-findlib.1632e503db0c6669c5375ddb3268c8114c1b347a68d591958a9998a5e4cc7163
 #+ocamlbuild.7dbc10e2fcb4197fa855b0d7ac0932a3c7920e53535a080407d725092501ef20
 #+opam.41ab4229b7606047164bfc9b9077da4555831edd67cf82d236ba1c6059bb9b96
-#+ocaml-topkg.0987876080339238102240cf92a7fc12eea584ad95e3e64d2c0e233714e81fa0
+#+ocaml-topkg.e7c246ea404469659e453fd9a9eac8dc96cca0e654003f57f20ea3a26b2a3b85
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
diff --git a/variants/root-x86_64/ocaml-bos b/variants/root-x86_64/ocaml-bos
@@ -5,12 +5,12 @@
 #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc
 #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676
 #+ocaml.4b14d5c50c08207a0442af369f9995a12f6a15db8d8b0fd5247a982789fc3090
-#+ocaml-findlib.da3c6e8cdab92fdea8305b1438434afbb9e70579f26ed2a3e81059c03a6ce386
+#+ocaml-findlib.1632e503db0c6669c5375ddb3268c8114c1b347a68d591958a9998a5e4cc7163
 #+ocamlbuild.7dbc10e2fcb4197fa855b0d7ac0932a3c7920e53535a080407d725092501ef20
 #+opam.41ab4229b7606047164bfc9b9077da4555831edd67cf82d236ba1c6059bb9b96
-#+ocaml-topkg.0987876080339238102240cf92a7fc12eea584ad95e3e64d2c0e233714e81fa0
-#+ocaml-astring.2069c9bf6d4b7481a21bc32e8cc76d2b8968c2a798abbe87127dcc39a50dc1ff
-#+ocaml-rresult.eb945811faf9d90aac83d1a9bd7aaf66be9852cea70a4ae249933f85b9e53af0
+#+ocaml-topkg.e7c246ea404469659e453fd9a9eac8dc96cca0e654003f57f20ea3a26b2a3b85
+#+ocaml-astring.fafb886678ceb5643b2503aff276d67165f728b1b6bc6f2d97be9f8596eb96db
+#+ocaml-rresult.61027b6c85b88f8699b5f7c6774fd6ae47c455a898ba79d3c7c86645d97e7c12
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib
@@ -45,7 +45,9 @@ cd 'findlib-1.9.8'
 make -j1 all opt
 
 # workaround `topfind` getting installed to stdlib directory, this is not configurable
-ln -s "$pthbs_package" "$pthbs_destdir/versions/ocaml.4b14d5c50c08207a0442af369f9995a12f6a15db8d8b0fd5247a982789fc3090"
+stdlib="$pthbs_destdir/versions/ocaml.4b14d5c50c08207a0442af369f9995a12f6a15db8d8b0fd5247a982789fc3090"
+mkdir -p "${stdlib%/*}"
+ln -s "$pthbs_package" "$stdlib"
 make install prefix="$pthbs_destdir"
 
 
diff --git a/variants/root-x86_64/ocaml-rresult b/variants/root-x86_64/ocaml-rresult
@@ -5,10 +5,10 @@
 #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc
 #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676
 #+ocaml.4b14d5c50c08207a0442af369f9995a12f6a15db8d8b0fd5247a982789fc3090
-#+ocaml-findlib.da3c6e8cdab92fdea8305b1438434afbb9e70579f26ed2a3e81059c03a6ce386
+#+ocaml-findlib.1632e503db0c6669c5375ddb3268c8114c1b347a68d591958a9998a5e4cc7163
 #+ocamlbuild.7dbc10e2fcb4197fa855b0d7ac0932a3c7920e53535a080407d725092501ef20
 #+opam.41ab4229b7606047164bfc9b9077da4555831edd67cf82d236ba1c6059bb9b96
-#+ocaml-topkg.0987876080339238102240cf92a7fc12eea584ad95e3e64d2c0e233714e81fa0
+#+ocaml-topkg.e7c246ea404469659e453fd9a9eac8dc96cca0e654003f57f20ea3a26b2a3b85
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/root-x86_64/ocaml-topkg b/variants/root-x86_64/ocaml-topkg
@@ -5,7 +5,7 @@
 #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc
 #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676
 #+ocaml.4b14d5c50c08207a0442af369f9995a12f6a15db8d8b0fd5247a982789fc3090
-#+ocaml-findlib.da3c6e8cdab92fdea8305b1438434afbb9e70579f26ed2a3e81059c03a6ce386
+#+ocaml-findlib.1632e503db0c6669c5375ddb3268c8114c1b347a68d591958a9998a5e4cc7163
 #+ocamlbuild.7dbc10e2fcb4197fa855b0d7ac0932a3c7920e53535a080407d725092501ef20
 #+opam.41ab4229b7606047164bfc9b9077da4555831edd67cf82d236ba1c6059bb9b96
 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:.
diff --git a/variants/root-x86_64/wip.environment b/variants/root-x86_64/wip.environment
@@ -4,4 +4,4 @@
 #+ocamlbuild.7dbc10e2fcb4197fa855b0d7ac0932a3c7920e53535a080407d725092501ef20
 #+ocaml-base.e5ace8983e084348e90d518c91ff918d0270001074c8c4890d93d7d0cc971120
 #+opam.41ab4229b7606047164bfc9b9077da4555831edd67cf82d236ba1c6059bb9b96
-#+ocaml-bos.ce9abc118ea6ac71e465a3c198dbd0540c732c3df87cfa1e21fa646c0d986b70-
\ No newline at end of file
+#+ocaml-bos.b657b73448d8f070c2db1fa9af81af30d8e1d3a856af1e494b7e46365b331612+
\ No newline at end of file