mrrl

commit e295435f36324d31e56247f400ad4392796aa900
parent 6547c6e28122f5570f6052a17b399642bc1cd92b
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Wed, 29 Oct 2025 00:42:04 +0000

ocaml packages

Diffstat:
M
templates/pkg/ocaml-findlib
 | 
18
+++++++++++-------
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, 37 insertions(+), 33 deletions(-)
diff --git a/templates/pkg/ocaml-findlib b/templates/pkg/ocaml-findlib
@@ -8,7 +8,7 @@
 #+{{pkg_install_name("m4")}}
 #+{{pkg_install_name("ocaml")}}
 #@untar:-z:{{downloads["findlib-" + assertion(pkg_version) + ".tar.gz"]}}:.
-{% endblock %}
+{% endblock package_deps %}
 {%- block configure %}
 ./configure -h || true
 ./configure \
@@ -18,15 +18,19 @@
 	-config "$prefix/config/etc/findlib.conf" \
 	-no-camlp4
  
-{% endblock %}
-{% block check -%}
-check_static command/ocamlfind
+{% endblock configure %}
+{% block build -%}
+make -j1 all opt
 
-{% endblock %}
+{% endblock build %}
 {% block install -%}
-make install prefix="$dest"
+make install prefix="$pthbs_destdir"
 
-{% endblock %}
+{% endblock install %}
+{% block check -%}
+check_static command/ocamlfind
+
+{% endblock check %}
 {% block genlinks_begin %}
 	x["./command/ocamlfind"]=1
 {% endblock %}
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.ef754772d8f7327d0be86b448ecdefacca57060d3e358a9d917b40e9e323d763
-#+ocaml-findlib.9f7b18bacf214695991704ad7f7cdbf2ef5e7dac69ba6da440ad80a5b69fd47f
+#+ocaml-findlib.215a7419f723d4b768c809461528cdb152f32882a85ed6deb9d3c71aa898d286
 #+ocamlbuild.1f92ef06cb109487b573ecdd2059d0b0ab559ec12ac113d9fa88a4372103d884
 #+opam.980b1502f3730e01bb440581e4d7a06832832110b48a7f1d7f37d2bb5143cdfd
-#+ocaml-topkg.96dface0ee3d7a56de406acfec280f7a8d3c10ec58c39d688d3be62fcbeb8c52
+#+ocaml-topkg.37d404dea1c25084f8508b3b95f28fb61d07103008f97144b4d7d1e3a3692714
 #@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.ef754772d8f7327d0be86b448ecdefacca57060d3e358a9d917b40e9e323d763
-#+ocaml-findlib.9f7b18bacf214695991704ad7f7cdbf2ef5e7dac69ba6da440ad80a5b69fd47f
+#+ocaml-findlib.215a7419f723d4b768c809461528cdb152f32882a85ed6deb9d3c71aa898d286
 #+ocamlbuild.1f92ef06cb109487b573ecdd2059d0b0ab559ec12ac113d9fa88a4372103d884
 #+opam.980b1502f3730e01bb440581e4d7a06832832110b48a7f1d7f37d2bb5143cdfd
-#+ocaml-topkg.96dface0ee3d7a56de406acfec280f7a8d3c10ec58c39d688d3be62fcbeb8c52
-#+ocaml-astring.2fef0ae08ba8da63f0bc2cc113a0d03bfba520f7f66869a9533a47debfbf983b
-#+ocaml-rresult.d69c970486bbe6e6d5a13c1b83f4647ab9d5ecc3792b5cedcf3bb51891c02e9a
+#+ocaml-topkg.37d404dea1c25084f8508b3b95f28fb61d07103008f97144b4d7d1e3a3692714
+#+ocaml-astring.ea3169c6521ccbbeff83ed92a8a591963c4b3138b428a741c1f865fa4dd06751
+#+ocaml-rresult.ffd0cf2edfad2cfc8de7e764f6a33a81c9d227e527443fa6aa23657c2e845be0
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib
@@ -26,9 +26,9 @@ cd 'ocamlfind-findlib-1.9.8'
 	-no-camlp4
  
 
-make -j${JOBS:-1} -l$((1+${JOBS:-1}))
+make -j1 all opt
 
-make install prefix="$dest"
+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.ef754772d8f7327d0be86b448ecdefacca57060d3e358a9d917b40e9e323d763
-#+ocaml-findlib.9f7b18bacf214695991704ad7f7cdbf2ef5e7dac69ba6da440ad80a5b69fd47f
+#+ocaml-findlib.215a7419f723d4b768c809461528cdb152f32882a85ed6deb9d3c71aa898d286
 #+ocamlbuild.1f92ef06cb109487b573ecdd2059d0b0ab559ec12ac113d9fa88a4372103d884
 #+opam.980b1502f3730e01bb440581e4d7a06832832110b48a7f1d7f37d2bb5143cdfd
-#+ocaml-topkg.96dface0ee3d7a56de406acfec280f7a8d3c10ec58c39d688d3be62fcbeb8c52
+#+ocaml-topkg.37d404dea1c25084f8508b3b95f28fb61d07103008f97144b4d7d1e3a3692714
 #@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.ef754772d8f7327d0be86b448ecdefacca57060d3e358a9d917b40e9e323d763
-#+ocaml-findlib.9f7b18bacf214695991704ad7f7cdbf2ef5e7dac69ba6da440ad80a5b69fd47f
+#+ocaml-findlib.215a7419f723d4b768c809461528cdb152f32882a85ed6deb9d3c71aa898d286
 #+ocamlbuild.1f92ef06cb109487b573ecdd2059d0b0ab559ec12ac113d9fa88a4372103d884
 #+opam.980b1502f3730e01bb440581e4d7a06832832110b48a7f1d7f37d2bb5143cdfd
 #@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.1f92ef06cb109487b573ecdd2059d0b0ab559ec12ac113d9fa88a4372103d884
 #+ocaml-base.15c014249975c989e3c9b2e5379406579f3dbd7cdfa40aac8628865bb57df155
 #+opam.980b1502f3730e01bb440581e4d7a06832832110b48a7f1d7f37d2bb5143cdfd
-#+ocaml-bos.644716950f146bc9f184c45a090dd81a352e41a4288c62258bf40774727a14bc-
\ No newline at end of file
+#+ocaml-bos.a41644ed71a395e9f2656a487e93e05a27a33de6ecfecfb635e8caa7f3ff7403+
\ 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.5f284ca479cb1311e030bce243d0075ef6bdbc702f514ca5a836b4638b203691
-#+ocaml-findlib.0864f54665346a620c58009df7b680790d03c38c4b0bc17add87338cd2ec3caf
+#+ocaml-findlib.3ad4743e99cbe6d924289f8646db2a89344c5f6d42150b7e870bced7a3c7f1fa
 #+ocamlbuild.c3517ef4f01ee9188faf3fc292460b4865e24fed652e1079d153e4bc1345bdfc
 #+opam.0024db1cd6d51699e0b9dc7163d9ada59a1503d039065f64b55b7e4433024e03
-#+ocaml-topkg.139aa29977a26ad83fa3cf7e4db97a414fef31c4a321c25ac63283f7288220bc
+#+ocaml-topkg.e75471a1837323ce15ccabe7cfeba5c35c4dd242564b8a41aca4c107a050c9ef
 #@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.5f284ca479cb1311e030bce243d0075ef6bdbc702f514ca5a836b4638b203691
-#+ocaml-findlib.0864f54665346a620c58009df7b680790d03c38c4b0bc17add87338cd2ec3caf
+#+ocaml-findlib.3ad4743e99cbe6d924289f8646db2a89344c5f6d42150b7e870bced7a3c7f1fa
 #+ocamlbuild.c3517ef4f01ee9188faf3fc292460b4865e24fed652e1079d153e4bc1345bdfc
 #+opam.0024db1cd6d51699e0b9dc7163d9ada59a1503d039065f64b55b7e4433024e03
-#+ocaml-topkg.139aa29977a26ad83fa3cf7e4db97a414fef31c4a321c25ac63283f7288220bc
-#+ocaml-astring.05e0d4aea5ce354a2245bbcb223f3e8e21101d68e7bb9f516a48498b4215f745
-#+ocaml-rresult.8bd9ba3915d2366f87122b569c342bce0ec8c46dae6201fb626d9bd06dab99cc
+#+ocaml-topkg.e75471a1837323ce15ccabe7cfeba5c35c4dd242564b8a41aca4c107a050c9ef
+#+ocaml-astring.1501301a8793bb0207f0b26e208496d7e134b5ea0c40b493a30abbcecc9bde45
+#+ocaml-rresult.8078f0813d236c1f88d69836e0d2f1697c4ce38c5b03666568c95426e8c25e90
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib
@@ -26,9 +26,9 @@ cd 'ocamlfind-findlib-1.9.8'
 	-no-camlp4
  
 
-make -j${JOBS:-1} -l$((1+${JOBS:-1}))
+make -j1 all opt
 
-make install prefix="$dest"
+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.5f284ca479cb1311e030bce243d0075ef6bdbc702f514ca5a836b4638b203691
-#+ocaml-findlib.0864f54665346a620c58009df7b680790d03c38c4b0bc17add87338cd2ec3caf
+#+ocaml-findlib.3ad4743e99cbe6d924289f8646db2a89344c5f6d42150b7e870bced7a3c7f1fa
 #+ocamlbuild.c3517ef4f01ee9188faf3fc292460b4865e24fed652e1079d153e4bc1345bdfc
 #+opam.0024db1cd6d51699e0b9dc7163d9ada59a1503d039065f64b55b7e4433024e03
-#+ocaml-topkg.139aa29977a26ad83fa3cf7e4db97a414fef31c4a321c25ac63283f7288220bc
+#+ocaml-topkg.e75471a1837323ce15ccabe7cfeba5c35c4dd242564b8a41aca4c107a050c9ef
 #@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.5f284ca479cb1311e030bce243d0075ef6bdbc702f514ca5a836b4638b203691
-#+ocaml-findlib.0864f54665346a620c58009df7b680790d03c38c4b0bc17add87338cd2ec3caf
+#+ocaml-findlib.3ad4743e99cbe6d924289f8646db2a89344c5f6d42150b7e870bced7a3c7f1fa
 #+ocamlbuild.c3517ef4f01ee9188faf3fc292460b4865e24fed652e1079d153e4bc1345bdfc
 #+opam.0024db1cd6d51699e0b9dc7163d9ada59a1503d039065f64b55b7e4433024e03
 #@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.c3517ef4f01ee9188faf3fc292460b4865e24fed652e1079d153e4bc1345bdfc
 #+ocaml-base.def774f8d6a68e11e8d7e1d3291b67fbd8711662f91cf843e69dd729cb9c566c
 #+opam.0024db1cd6d51699e0b9dc7163d9ada59a1503d039065f64b55b7e4433024e03
-#+ocaml-bos.9f44fa6d18b351d0eb2bb2b3e98990f53204315b3db76ae613cf32897b3bcf59-
\ No newline at end of file
+#+ocaml-bos.f793fe44f704d5705360454b7cac0d00d9ce6821336f7ccace2c8faf46015a12+
\ No newline at end of file