mrrl

commit d573b328c53e4773720f9a1dd4f584adc65ceeec
parent 2e84a0e9b5287462566c2c038bd417b5d132b44c
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Tue, 28 Oct 2025 00:59:11 +0000

ocaml packages

Diffstat:
M
templates/pkg/opam
 | 
10
+++++++---
M
variants/ccx-x86_64/opam
 | 
10
+++++++---
M
variants/ccx-x86_64/wip.environment
 | 
4
++--
M
variants/root-x86_64/opam
 | 
10
+++++++---
M
variants/root-x86_64/wip.environment
 | 
4
++--

5 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/templates/pkg/opam b/templates/pkg/opam
@@ -37,12 +37,16 @@ make DUNE_ARGS=--verbose
 {% endblock build -%}
 {% block check -%}
 make tests || true
-check_static bin/opam
-check_static bin/opam-installer
+## dynamic build
+#check_static bin/opam
+#check_static bin/opam-installer
+"$dest/bin/opam" --version
+"$dest/bin/opam-installer" --version
 
 {% endblock check %}
 {% block genlinks_begin %}
-	x["./command/opam"]=1
+	x["./bin/opam"]=1
+	x["./bin/opam-installer"]=1
 {% endblock genlinks_begin %}
 {% block genlinks_rules %}
 $2 == "library.ocaml" { link($0); next }
diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam
@@ -58,15 +58,19 @@ make DESTDIR="$pthbs_destdir" install
 
 
 make tests || true
-check_static bin/opam
-check_static bin/opam-installer
+## dynamic build
+#check_static bin/opam
+#check_static bin/opam-installer
+"$dest/bin/opam" --version
+"$dest/bin/opam-installer" --version
 
 
 
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
 BEGIN {
-	x["./command/opam"]=1
+	x["./bin/opam"]=1
+	x["./bin/opam-installer"]=1
 }
 
 function r1(s) {
diff --git a/variants/ccx-x86_64/wip.environment b/variants/ccx-x86_64/wip.environment
@@ -3,4 +3,4 @@
 #+dune.0bf1fa603f0e8ae0f1b4fd7e28d8be34f035e643e5594e0a380ce13485b06a6c
 #+ocamlbuild.1f92ef06cb109487b573ecdd2059d0b0ab559ec12ac113d9fa88a4372103d884
 #+ocaml-base.15c014249975c989e3c9b2e5379406579f3dbd7cdfa40aac8628865bb57df155
-#+opam.3df4741f0b1229a4304e20cb571acf8439c5e1de51fa2a40423488b3bc07d39a-
\ No newline at end of file
+#+opam.980b1502f3730e01bb440581e4d7a06832832110b48a7f1d7f37d2bb5143cdfd+
\ No newline at end of file
diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam
@@ -58,15 +58,19 @@ make DESTDIR="$pthbs_destdir" install
 
 
 make tests || true
-check_static bin/opam
-check_static bin/opam-installer
+## dynamic build
+#check_static bin/opam
+#check_static bin/opam-installer
+"$dest/bin/opam" --version
+"$dest/bin/opam-installer" --version
 
 
 
 cd "$pthbs_destdir/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
 BEGIN {
-	x["./command/opam"]=1
+	x["./bin/opam"]=1
+	x["./bin/opam-installer"]=1
 }
 
 function r1(s) {
diff --git a/variants/root-x86_64/wip.environment b/variants/root-x86_64/wip.environment
@@ -3,4 +3,4 @@
 #+dune.d71d865a1e049f9cb3345d4588f36c028ef41ae48915a57ce510bfe02d623bf8
 #+ocamlbuild.c3517ef4f01ee9188faf3fc292460b4865e24fed652e1079d153e4bc1345bdfc
 #+ocaml-base.def774f8d6a68e11e8d7e1d3291b67fbd8711662f91cf843e69dd729cb9c566c
-#+opam.54dc367b8ac116d27bbe1b34a22cecdcad68ba6ab6bf19e5754d0f60497d7130-
\ No newline at end of file
+#+opam.0024db1cd6d51699e0b9dc7163d9ada59a1503d039065f64b55b7e4433024e03+
\ No newline at end of file