mrrl

commit fb17f20a4a86636bb717ae1ae9124e4452cb8300
parent 40505f80e7db0df3974fd885c4e61e4ed3efd18e
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Tue,  4 Nov 2025 00:11:54 +0000

use findlib in ocaml-topkg

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

11 files changed, 17 insertions(+), 17 deletions(-)
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 -I "$OCAMLPATH" pkg/pkg.ml build --dev-pkg true
+ocamlfind ocaml -package findlib 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
@@ -8,7 +8,7 @@
 #+ocaml-findlib.452c52f90ab43fec38cfbed46be94ef3eaaea1c41c567fe07f61793afd1f6685
 #+ocamlbuild.af1e7c1126b473143018d4844d1142ae30a23db6b8c435f28ba21bbe015b03f8
 #+opam.714997e34c97a27678ee9a24f03256bbda3ac9e44597b10f56c795f37a17e989
-#+ocaml-topkg.3d2a78ddfc0100a4a39dd677073a9c740b31b2634f22ea82edb5647eda155690
+#+ocaml-topkg.81b3c98e5242e767388920f3e02183e79cc2c8a787653cd28a9538e2432cd251
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-bos b/variants/ccx-x86_64/ocaml-bos
@@ -8,9 +8,9 @@
 #+ocaml-findlib.452c52f90ab43fec38cfbed46be94ef3eaaea1c41c567fe07f61793afd1f6685
 #+ocamlbuild.af1e7c1126b473143018d4844d1142ae30a23db6b8c435f28ba21bbe015b03f8
 #+opam.714997e34c97a27678ee9a24f03256bbda3ac9e44597b10f56c795f37a17e989
-#+ocaml-topkg.3d2a78ddfc0100a4a39dd677073a9c740b31b2634f22ea82edb5647eda155690
-#+ocaml-astring.03b705e21cb06ef6401894596dc0936e560556bfb9cfda2a7099d8f180c8f0d2
-#+ocaml-rresult.8b4c0fbe6e0da2180b9fed438780c4b0dd6ed0ef61b21ff02b5cea491c158250
+#+ocaml-topkg.81b3c98e5242e767388920f3e02183e79cc2c8a787653cd28a9538e2432cd251
+#+ocaml-astring.8fe8239e5eb422950e01c13a610e3699626ad53ec93744d9188b2fb9327a8022
+#+ocaml-rresult.2b59474bf0530e32ab3f17f417940edf5e447403015f4895cc2a659004ced24f
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-rresult b/variants/ccx-x86_64/ocaml-rresult
@@ -8,7 +8,7 @@
 #+ocaml-findlib.452c52f90ab43fec38cfbed46be94ef3eaaea1c41c567fe07f61793afd1f6685
 #+ocamlbuild.af1e7c1126b473143018d4844d1142ae30a23db6b8c435f28ba21bbe015b03f8
 #+opam.714997e34c97a27678ee9a24f03256bbda3ac9e44597b10f56c795f37a17e989
-#+ocaml-topkg.3d2a78ddfc0100a4a39dd677073a9c740b31b2634f22ea82edb5647eda155690
+#+ocaml-topkg.81b3c98e5242e767388920f3e02183e79cc2c8a787653cd28a9538e2432cd251
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-topkg b/variants/ccx-x86_64/ocaml-topkg
@@ -19,7 +19,7 @@ cd 'topkg-1.0.5'
 
 
 
-ocaml -I "$OCAMLPATH" pkg/pkg.ml build --dev-pkg true
+ocamlfind ocaml -package findlib 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.d3ade4295395745e57e12670d6e305945756892791dd62239cd4f267ee269d03-
\ No newline at end of file
+#+ocaml-bos.963094579c00c6c2eccc18c860a3bdf2791a78bb875dd5b73213d4a5dee06308+
\ No newline at end of file
diff --git a/variants/root-x86_64/ocaml-astring b/variants/root-x86_64/ocaml-astring
@@ -8,7 +8,7 @@
 #+ocaml-findlib.4efc3c8e5bf17cd7f950e0ef974b5ca97213ed0773874b51133d30c1cd564a0d
 #+ocamlbuild.7dbc10e2fcb4197fa855b0d7ac0932a3c7920e53535a080407d725092501ef20
 #+opam.41ab4229b7606047164bfc9b9077da4555831edd67cf82d236ba1c6059bb9b96
-#+ocaml-topkg.43516f8e88d11ddf9a7ac69cf9d7faae8d191444a9a7d84c9398c37f4605805f
+#+ocaml-topkg.6894995ab2d75c0c2238f06478ac36b9d03f4691b77e643e99771aca29c63972
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
diff --git a/variants/root-x86_64/ocaml-bos b/variants/root-x86_64/ocaml-bos
@@ -8,9 +8,9 @@
 #+ocaml-findlib.4efc3c8e5bf17cd7f950e0ef974b5ca97213ed0773874b51133d30c1cd564a0d
 #+ocamlbuild.7dbc10e2fcb4197fa855b0d7ac0932a3c7920e53535a080407d725092501ef20
 #+opam.41ab4229b7606047164bfc9b9077da4555831edd67cf82d236ba1c6059bb9b96
-#+ocaml-topkg.43516f8e88d11ddf9a7ac69cf9d7faae8d191444a9a7d84c9398c37f4605805f
-#+ocaml-astring.b4a699ec268d35c506b2cd926ae98d59c68d66cedba13b2ad133b62835db0693
-#+ocaml-rresult.9ed88dc259826ab37b9f511b9d17c6e950c6408b506319b0a665c63bc25985e2
+#+ocaml-topkg.6894995ab2d75c0c2238f06478ac36b9d03f4691b77e643e99771aca29c63972
+#+ocaml-astring.6bea398eb71b2d12110ba86dff9945a1936f3e5b08cc334cdd6419b7cdf3bc22
+#+ocaml-rresult.57db3b179ca844b3652aef22d32a2fdbd6aa96d6e3dbd27de0d399e0792cf520
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/root-x86_64/ocaml-rresult b/variants/root-x86_64/ocaml-rresult
@@ -8,7 +8,7 @@
 #+ocaml-findlib.4efc3c8e5bf17cd7f950e0ef974b5ca97213ed0773874b51133d30c1cd564a0d
 #+ocamlbuild.7dbc10e2fcb4197fa855b0d7ac0932a3c7920e53535a080407d725092501ef20
 #+opam.41ab4229b7606047164bfc9b9077da4555831edd67cf82d236ba1c6059bb9b96
-#+ocaml-topkg.43516f8e88d11ddf9a7ac69cf9d7faae8d191444a9a7d84c9398c37f4605805f
+#+ocaml-topkg.6894995ab2d75c0c2238f06478ac36b9d03f4691b77e643e99771aca29c63972
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/root-x86_64/ocaml-topkg b/variants/root-x86_64/ocaml-topkg
@@ -19,7 +19,7 @@ cd 'topkg-1.0.5'
 
 
 
-ocaml -I "$OCAMLPATH" pkg/pkg.ml build --dev-pkg true
+ocamlfind ocaml -package findlib 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.f7095ee5ae69a71bffde77991cd7f6b4b7b4c01a307f32d82a847f86d41b939d-
\ No newline at end of file
+#+ocaml-bos.95be375e7e7b1cdd7113d9b0f632a2e3a8b18d7ea533300fc0ec554f08b2731f+
\ No newline at end of file