mrrl

commit 53015f3279ddecf28c28527305f3e242251bf4ed
parent d76790f372ccb1e7a43d36c4b04dd8287feea22c
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Fri, 31 Oct 2025 07:17:18 +0000

ocaml packages

Diffstat:
M
templates/pkg/ocaml-findlib
 | 
4
+---
M
templates/pkg/ocaml-topkg
 | 
2
+-
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
 | 
4
++--
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
 | 
4
++--
M
variants/root-x86_64/wip.environment
 | 
4
++--

14 files changed, 28 insertions(+), 34 deletions(-)
diff --git a/templates/pkg/ocaml-findlib b/templates/pkg/ocaml-findlib
@@ -36,9 +36,7 @@ check_static command/ocamlfind
 {% endblock check %}
 {% block genlinks_begin %}
 	x["./command/ocamlfind"]=1
-	x["./library.ocaml/topfind/topfind.a"]=1
-	x["./library.ocaml/topfind/topfind.ml"]=1
-	x["./library.ocaml/topfind/topfind.cma"]=1
+	x["./library.ocaml/topfind/topfind.mli"]=1
 	x["./library.ocaml/topfind/topfind.cmi"]=1
 {% endblock %}
 {% block genlinks_rules %}
diff --git a/templates/pkg/ocaml-topkg b/templates/pkg/ocaml-topkg
@@ -3,7 +3,7 @@
 {%- set pkg_source="tbz" -%}
 {% extends "topkg" %}
 {%- block build %}
-ocaml pkg/pkg.ml build --dev-pkg true
+ocaml -I "$OCAMLPATH" pkg/pkg.ml build --dev-pkg true
 
 {% endblock build %}
 {% block genlinks_begin %}
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.db0b104dba2bfabf651a893db04e2933999441c1b44183ae48151c977b355c24
+#+ocaml-findlib.f8a78cd5511c33b7d7d0e504dfe2ccd8530748c3a6d056950b53ddf2609c1534
 #+ocamlbuild.af1e7c1126b473143018d4844d1142ae30a23db6b8c435f28ba21bbe015b03f8
 #+opam.714997e34c97a27678ee9a24f03256bbda3ac9e44597b10f56c795f37a17e989
-#+ocaml-topkg.bcef4e4df7a8c3726a9d03932b65ab5f1bdc0f5bf4191554210d0f9e272b7d87
+#+ocaml-topkg.a6ffed9a15e92d3b5f74864ab478a5c1a2810b4b098b0224cf41aa3a4ae330c8
 #@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.db0b104dba2bfabf651a893db04e2933999441c1b44183ae48151c977b355c24
+#+ocaml-findlib.f8a78cd5511c33b7d7d0e504dfe2ccd8530748c3a6d056950b53ddf2609c1534
 #+ocamlbuild.af1e7c1126b473143018d4844d1142ae30a23db6b8c435f28ba21bbe015b03f8
 #+opam.714997e34c97a27678ee9a24f03256bbda3ac9e44597b10f56c795f37a17e989
-#+ocaml-topkg.bcef4e4df7a8c3726a9d03932b65ab5f1bdc0f5bf4191554210d0f9e272b7d87
-#+ocaml-astring.83bd9d0f221c8c35cf048fa002e985b1b37825a1ac907a50d33bb30139375788
-#+ocaml-rresult.bd02d62b92e7f531733eff2a0662799e502bc37f59e6ad4f25d094f86492efed
+#+ocaml-topkg.a6ffed9a15e92d3b5f74864ab478a5c1a2810b4b098b0224cf41aa3a4ae330c8
+#+ocaml-astring.f90008e0f4e3090e461a2523f8d95e16b8d8998f49f24453a8e55c06cd68cc28
+#+ocaml-rresult.3848318e691f635e981be9631c2d5b084b155fab784f3b8b4438fd41309119b2
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib
@@ -56,9 +56,7 @@ cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
 BEGIN {
 	x["./command/ocamlfind"]=1
-	x["./library.ocaml/topfind/topfind.a"]=1
-	x["./library.ocaml/topfind/topfind.ml"]=1
-	x["./library.ocaml/topfind/topfind.cma"]=1
+	x["./library.ocaml/topfind/topfind.mli"]=1
 	x["./library.ocaml/topfind/topfind.cmi"]=1
 }
 
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.db0b104dba2bfabf651a893db04e2933999441c1b44183ae48151c977b355c24
+#+ocaml-findlib.f8a78cd5511c33b7d7d0e504dfe2ccd8530748c3a6d056950b53ddf2609c1534
 #+ocamlbuild.af1e7c1126b473143018d4844d1142ae30a23db6b8c435f28ba21bbe015b03f8
 #+opam.714997e34c97a27678ee9a24f03256bbda3ac9e44597b10f56c795f37a17e989
-#+ocaml-topkg.bcef4e4df7a8c3726a9d03932b65ab5f1bdc0f5bf4191554210d0f9e272b7d87
+#+ocaml-topkg.a6ffed9a15e92d3b5f74864ab478a5c1a2810b4b098b0224cf41aa3a4ae330c8
 #@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.db0b104dba2bfabf651a893db04e2933999441c1b44183ae48151c977b355c24
+#+ocaml-findlib.f8a78cd5511c33b7d7d0e504dfe2ccd8530748c3a6d056950b53ddf2609c1534
 #+ocamlbuild.af1e7c1126b473143018d4844d1142ae30a23db6b8c435f28ba21bbe015b03f8
 #+opam.714997e34c97a27678ee9a24f03256bbda3ac9e44597b10f56c795f37a17e989
 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:.
@@ -19,7 +19,7 @@ cd 'topkg-1.0.5'
 
 
 
-ocaml pkg/pkg.ml build --dev-pkg true
+ocaml -I "$OCAMLPATH" pkg/pkg.ml build --dev-pkg true
 
 
 	opam-installer -i \
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.7bedfa7a08854e83b539ba03f94d94b3263921db80158216ec715eac656e924f-
\ No newline at end of file
+#+ocaml-bos.6d5a7737a7002dd5e7724e61b95f1ab9231d38a1c239bc79b22a33e090b4b410+
\ 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.ac0d57e5bf5e87188c50dba95b5fbc0dc7ed3dd4de798289c867724df07591f8
+#+ocaml-findlib.7ac469cac19811f5e51241a2f8d3f3d37cb73207b53eb95b6767ea689f0da11d
 #+ocamlbuild.7dbc10e2fcb4197fa855b0d7ac0932a3c7920e53535a080407d725092501ef20
 #+opam.41ab4229b7606047164bfc9b9077da4555831edd67cf82d236ba1c6059bb9b96
-#+ocaml-topkg.a341cc21596f369aeb24ed75a5f0208be9b6aed1d3631bdd1b5e1fc6f65bd532
+#+ocaml-topkg.6bca4f664577f42956d7bca8bf03a4b4bf2999f5c967e224baa76c83ad132c58
 #@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.ac0d57e5bf5e87188c50dba95b5fbc0dc7ed3dd4de798289c867724df07591f8
+#+ocaml-findlib.7ac469cac19811f5e51241a2f8d3f3d37cb73207b53eb95b6767ea689f0da11d
 #+ocamlbuild.7dbc10e2fcb4197fa855b0d7ac0932a3c7920e53535a080407d725092501ef20
 #+opam.41ab4229b7606047164bfc9b9077da4555831edd67cf82d236ba1c6059bb9b96
-#+ocaml-topkg.a341cc21596f369aeb24ed75a5f0208be9b6aed1d3631bdd1b5e1fc6f65bd532
-#+ocaml-astring.47d2b1eaf2ebc8bcbe3b1fef39e485d263a310a0d8f2b91d05d01b6cf9808db1
-#+ocaml-rresult.0c51044f6cd6ac01de686da72b39b08ecceb2f5f5ced7030c602550c5c7a8697
+#+ocaml-topkg.6bca4f664577f42956d7bca8bf03a4b4bf2999f5c967e224baa76c83ad132c58
+#+ocaml-astring.6aa5dec4a5377efed3674852d4f382200d314a01e677e4168c33be1e11d57f96
+#+ocaml-rresult.a269035b3fcd6f9935e6847511f5076be7d70abde92d6feeb8b7dab619b2f5b4
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib
@@ -56,9 +56,7 @@ cd "$pthbs_destdir/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
 BEGIN {
 	x["./command/ocamlfind"]=1
-	x["./library.ocaml/topfind/topfind.a"]=1
-	x["./library.ocaml/topfind/topfind.ml"]=1
-	x["./library.ocaml/topfind/topfind.cma"]=1
+	x["./library.ocaml/topfind/topfind.mli"]=1
 	x["./library.ocaml/topfind/topfind.cmi"]=1
 }
 
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.ac0d57e5bf5e87188c50dba95b5fbc0dc7ed3dd4de798289c867724df07591f8
+#+ocaml-findlib.7ac469cac19811f5e51241a2f8d3f3d37cb73207b53eb95b6767ea689f0da11d
 #+ocamlbuild.7dbc10e2fcb4197fa855b0d7ac0932a3c7920e53535a080407d725092501ef20
 #+opam.41ab4229b7606047164bfc9b9077da4555831edd67cf82d236ba1c6059bb9b96
-#+ocaml-topkg.a341cc21596f369aeb24ed75a5f0208be9b6aed1d3631bdd1b5e1fc6f65bd532
+#+ocaml-topkg.6bca4f664577f42956d7bca8bf03a4b4bf2999f5c967e224baa76c83ad132c58
 #@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.ac0d57e5bf5e87188c50dba95b5fbc0dc7ed3dd4de798289c867724df07591f8
+#+ocaml-findlib.7ac469cac19811f5e51241a2f8d3f3d37cb73207b53eb95b6767ea689f0da11d
 #+ocamlbuild.7dbc10e2fcb4197fa855b0d7ac0932a3c7920e53535a080407d725092501ef20
 #+opam.41ab4229b7606047164bfc9b9077da4555831edd67cf82d236ba1c6059bb9b96
 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:.
@@ -19,7 +19,7 @@ cd 'topkg-1.0.5'
 
 
 
-ocaml pkg/pkg.ml build --dev-pkg true
+ocaml -I "$OCAMLPATH" pkg/pkg.ml build --dev-pkg true
 
 
 	opam-installer -i \
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.6bdaead65e3d7d5e8a72ad486e33750a7e05e2ddff501781283fc495b4887e14-
\ No newline at end of file
+#+ocaml-bos.8c2531dd9a101c6f78f6817d955c554ca02fade6f465b254ce9ad7f77cb238d7+
\ No newline at end of file