mrrl

commit 6547c6e28122f5570f6052a17b399642bc1cd92b
parent 24a8c6ec5facbabf7eafcab68cc27874c27bf509
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Wed, 29 Oct 2025 00:35:58 +0000

ocaml packages

Diffstat:
M
templates/pkg/ocaml-findlib
 | 
8
++++++--
M
variants/ccx-x86_64/ocaml-astring
 | 
4
++--
M
variants/ccx-x86_64/ocaml-bos
 | 
8
++++----
M
variants/ccx-x86_64/ocaml-findlib
 | 
6
+++---
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
 | 
6
+++---
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, 34 insertions(+), 30 deletions(-)
diff --git a/templates/pkg/ocaml-findlib b/templates/pkg/ocaml-findlib
@@ -10,9 +10,9 @@
 #@untar:-z:{{downloads["findlib-" + assertion(pkg_version) + ".tar.gz"]}}:.
 {% endblock %}
 {%- block configure %}
+./configure -h || true
 ./configure \
-	-prefix "$prefix" \
-	-bindir "$prefix/bin" \
+	-bindir "$prefix/command" \
 	-mandir "$prefix/man" \
 	-sitelib "$prefix/library.ocaml" \
 	-config "$prefix/config/etc/findlib.conf" \
@@ -23,6 +23,10 @@
 check_static command/ocamlfind
 
 {% endblock %}
+{% block install -%}
+make install prefix="$dest"
+
+{% endblock %}
 {% 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.242d2994c1355362eb4bc2119816d5e7564c24e1e2f40686008162a65e8901a8
+#+ocaml-findlib.9f7b18bacf214695991704ad7f7cdbf2ef5e7dac69ba6da440ad80a5b69fd47f
 #+ocamlbuild.1f92ef06cb109487b573ecdd2059d0b0ab559ec12ac113d9fa88a4372103d884
 #+opam.980b1502f3730e01bb440581e4d7a06832832110b48a7f1d7f37d2bb5143cdfd
-#+ocaml-topkg.1184d262fa12e31801bf674ef454a01bfd107f4850ccba382e563ce16c3e3595
+#+ocaml-topkg.96dface0ee3d7a56de406acfec280f7a8d3c10ec58c39d688d3be62fcbeb8c52
 #@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.242d2994c1355362eb4bc2119816d5e7564c24e1e2f40686008162a65e8901a8
+#+ocaml-findlib.9f7b18bacf214695991704ad7f7cdbf2ef5e7dac69ba6da440ad80a5b69fd47f
 #+ocamlbuild.1f92ef06cb109487b573ecdd2059d0b0ab559ec12ac113d9fa88a4372103d884
 #+opam.980b1502f3730e01bb440581e4d7a06832832110b48a7f1d7f37d2bb5143cdfd
-#+ocaml-topkg.1184d262fa12e31801bf674ef454a01bfd107f4850ccba382e563ce16c3e3595
-#+ocaml-astring.c8d3fe0c74d089675a8016437a9319513bc2ed63719ae7bc8cee0245da4ded60
-#+ocaml-rresult.6a137de041a544735cd6b374223cf7486fdb33f03f7d2a0c9293d24102169315
+#+ocaml-topkg.96dface0ee3d7a56de406acfec280f7a8d3c10ec58c39d688d3be62fcbeb8c52
+#+ocaml-astring.2fef0ae08ba8da63f0bc2cc113a0d03bfba520f7f66869a9533a47debfbf983b
+#+ocaml-rresult.d69c970486bbe6e6d5a13c1b83f4647ab9d5ecc3792b5cedcf3bb51891c02e9a
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib
@@ -17,9 +17,9 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'ocamlfind-findlib-1.9.8'
 
 
+./configure -h || true
 ./configure \
-	-prefix "$prefix" \
-	-bindir "$prefix/bin" \
+	-bindir "$prefix/command" \
 	-mandir "$prefix/man" \
 	-sitelib "$prefix/library.ocaml" \
 	-config "$prefix/config/etc/findlib.conf" \
@@ -28,7 +28,7 @@ cd 'ocamlfind-findlib-1.9.8'
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
-make DESTDIR="$pthbs_destdir" install
+make install prefix="$dest"
 
 
 
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.242d2994c1355362eb4bc2119816d5e7564c24e1e2f40686008162a65e8901a8
+#+ocaml-findlib.9f7b18bacf214695991704ad7f7cdbf2ef5e7dac69ba6da440ad80a5b69fd47f
 #+ocamlbuild.1f92ef06cb109487b573ecdd2059d0b0ab559ec12ac113d9fa88a4372103d884
 #+opam.980b1502f3730e01bb440581e4d7a06832832110b48a7f1d7f37d2bb5143cdfd
-#+ocaml-topkg.1184d262fa12e31801bf674ef454a01bfd107f4850ccba382e563ce16c3e3595
+#+ocaml-topkg.96dface0ee3d7a56de406acfec280f7a8d3c10ec58c39d688d3be62fcbeb8c52
 #@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.242d2994c1355362eb4bc2119816d5e7564c24e1e2f40686008162a65e8901a8
+#+ocaml-findlib.9f7b18bacf214695991704ad7f7cdbf2ef5e7dac69ba6da440ad80a5b69fd47f
 #+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.fc8c9273cf06ea23ac9c4594179f988aa74ec1d8840cfb9bd364b7c187da8a6e-
\ No newline at end of file
+#+ocaml-bos.644716950f146bc9f184c45a090dd81a352e41a4288c62258bf40774727a14bc+
\ 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.e683b470a0061f86140f64a8964bc1f7826e1e3b470044a7c20dc255a1216adf
+#+ocaml-findlib.0864f54665346a620c58009df7b680790d03c38c4b0bc17add87338cd2ec3caf
 #+ocamlbuild.c3517ef4f01ee9188faf3fc292460b4865e24fed652e1079d153e4bc1345bdfc
 #+opam.0024db1cd6d51699e0b9dc7163d9ada59a1503d039065f64b55b7e4433024e03
-#+ocaml-topkg.820902ce7ca51587e85d2fa71f9c922f23a14a87baa5519f07dc76c0f554f752
+#+ocaml-topkg.139aa29977a26ad83fa3cf7e4db97a414fef31c4a321c25ac63283f7288220bc
 #@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.e683b470a0061f86140f64a8964bc1f7826e1e3b470044a7c20dc255a1216adf
+#+ocaml-findlib.0864f54665346a620c58009df7b680790d03c38c4b0bc17add87338cd2ec3caf
 #+ocamlbuild.c3517ef4f01ee9188faf3fc292460b4865e24fed652e1079d153e4bc1345bdfc
 #+opam.0024db1cd6d51699e0b9dc7163d9ada59a1503d039065f64b55b7e4433024e03
-#+ocaml-topkg.820902ce7ca51587e85d2fa71f9c922f23a14a87baa5519f07dc76c0f554f752
-#+ocaml-astring.cfa9b87cb1df24e54004f97535444caf1de9ca411eff8e629ca57460ee908676
-#+ocaml-rresult.d703286eaa43b719c2947e3530ae2aaeaca74838b88a19972fd2c672f4ac9aed
+#+ocaml-topkg.139aa29977a26ad83fa3cf7e4db97a414fef31c4a321c25ac63283f7288220bc
+#+ocaml-astring.05e0d4aea5ce354a2245bbcb223f3e8e21101d68e7bb9f516a48498b4215f745
+#+ocaml-rresult.8bd9ba3915d2366f87122b569c342bce0ec8c46dae6201fb626d9bd06dab99cc
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib
@@ -17,9 +17,9 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'ocamlfind-findlib-1.9.8'
 
 
+./configure -h || true
 ./configure \
-	-prefix "$prefix" \
-	-bindir "$prefix/bin" \
+	-bindir "$prefix/command" \
 	-mandir "$prefix/man" \
 	-sitelib "$prefix/library.ocaml" \
 	-config "$prefix/config/etc/findlib.conf" \
@@ -28,7 +28,7 @@ cd 'ocamlfind-findlib-1.9.8'
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
-make DESTDIR="$pthbs_destdir" install
+make install prefix="$dest"
 
 
 
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.e683b470a0061f86140f64a8964bc1f7826e1e3b470044a7c20dc255a1216adf
+#+ocaml-findlib.0864f54665346a620c58009df7b680790d03c38c4b0bc17add87338cd2ec3caf
 #+ocamlbuild.c3517ef4f01ee9188faf3fc292460b4865e24fed652e1079d153e4bc1345bdfc
 #+opam.0024db1cd6d51699e0b9dc7163d9ada59a1503d039065f64b55b7e4433024e03
-#+ocaml-topkg.820902ce7ca51587e85d2fa71f9c922f23a14a87baa5519f07dc76c0f554f752
+#+ocaml-topkg.139aa29977a26ad83fa3cf7e4db97a414fef31c4a321c25ac63283f7288220bc
 #@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.e683b470a0061f86140f64a8964bc1f7826e1e3b470044a7c20dc255a1216adf
+#+ocaml-findlib.0864f54665346a620c58009df7b680790d03c38c4b0bc17add87338cd2ec3caf
 #+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.4e1deca3e76b995d3ea12576ce928b08309287531eadc47f418042027278999a-
\ No newline at end of file
+#+ocaml-bos.9f44fa6d18b351d0eb2bb2b3e98990f53204315b3db76ae613cf32897b3bcf59+
\ No newline at end of file