mrrl

commit 02f5463f1f4fd3832999a53115c720a4535dbf58
parent b8ea186e54fb178bdefe9d99ca70cd65bf2f9463
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Sun, 26 Oct 2025 23:47:33 +0000

ocaml packages

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

5 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/templates/pkg/opam b/templates/pkg/opam
@@ -3,7 +3,8 @@
 {% extends "genlinks" %}
 {%- do import_functions.add("check_static") %}
 {% block package_deps -%}
-#+{{pkg_install_name("busybox-diffutils")}}
+#+{{pkg_install_name("diffutils")}}
+#+{{pkg_install_name("patch")}}
 #+{{pkg_install_name("gnu-make")}}
 #+{{pkg_install_name("musl-cross-make")}}
 #+{{pkg_install_name("ocaml")}}
@@ -11,6 +12,7 @@
 #@untar:-z:{{downloads["opam-full-" + assertion(pkg_version) + ".tar.gz"]}}:.
 {% endblock package_deps %}
 {%- block configure %}
+export DUNE_CACHE=disabled
 ./configure \
 	--prefix="$prefix" \
 	--libdir="$prefix/library.ocaml" \
@@ -26,8 +28,7 @@
 	--with-dune='{{pkg_install_dir("dune")}}/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
-	--enable-static \
-	--disable-shared
+	--enable-static
 
 {% endblock configure %}
 {% block check -%}
diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam
@@ -2,7 +2,8 @@
 #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f
 #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716
 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b
-#+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8
+#+diffutils.70f9ddaec27568b14a011789f3c6c51ee4b849637a2b8ea9dc8f6685a646c3cf
+#+patch.71865adfe1b1a83862c182902ff3bf77fcce6168cde6b35cd59fd5a85916e7c8
 #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062
 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f
 #+ocaml.ef754772d8f7327d0be86b448ecdefacca57060d3e358a9d917b40e9e323d763
@@ -31,6 +32,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'opam-full-2.4.1'
 
 
+export DUNE_CACHE=disabled
 ./configure \
 	--prefix="$prefix" \
 	--libdir="$prefix/library.ocaml" \
@@ -46,8 +48,7 @@ cd 'opam-full-2.4.1'
 	--with-dune='/home/ccx/versions/dune.0bf1fa603f0e8ae0f1b4fd7e28d8be34f035e643e5594e0a380ce13485b06a6c/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
-	--enable-static \
-	--disable-shared
+	--enable-static
 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
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.78dc585fbbe2f4e3c619625b2a65dc024438ae9bbdaf79dbbe973cb7c7337b22-
\ No newline at end of file
+#+opam.f14c412310b274ab69bcb9295900d2c2dde9e4004abc26223585656c8d210e66+
\ No newline at end of file
diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam
@@ -2,7 +2,8 @@
 #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002
 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7
 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b
-#+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc
+#+diffutils.dbe0e2258153174e9bde5107bab7a436d8c4d8b88e9d74f35eb72b67cfc73148
+#+patch.1f7ab95c511ea31573c4b2e3338bd15925cd1b93631a0681388475e41678d93f
 #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15
 #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676
 #+ocaml.5f284ca479cb1311e030bce243d0075ef6bdbc702f514ca5a836b4638b203691
@@ -31,6 +32,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'opam-full-2.4.1'
 
 
+export DUNE_CACHE=disabled
 ./configure \
 	--prefix="$prefix" \
 	--libdir="$prefix/library.ocaml" \
@@ -46,8 +48,7 @@ cd 'opam-full-2.4.1'
 	--with-dune='/versions/dune.d71d865a1e049f9cb3345d4588f36c028ef41ae48915a57ce510bfe02d623bf8/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
-	--enable-static \
-	--disable-shared
+	--enable-static
 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
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.66c964a0971bf85c100fd9a2f5972aab0ec60126cefd13471b1f5db60a8eb685-
\ No newline at end of file
+#+opam.10852db11408b0ffbeaff4fd5b40794937f67bd42ec39269e39312b356589366+
\ No newline at end of file