commit fda5f42c5c7394ce152bab7160ce368d91859e21
parent af1791c8a9abab2ee512b0768d150b45163f3b73
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Wed, 22 Oct 2025 17:50:41 +0000
ocaml packages
Diffstat:
9 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/templates/pkg/dune b/templates/pkg/dune
@@ -7,6 +7,7 @@
#@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
{% endblock %}
{%- block prepare %}
+{% include "functions/check_static" %}
{{ super() }}
# This allows 'dune --version' to output the correct version instead of "n/a"
sed -i "/^(name dune)/a (version {{pkg_version}})" dune-project
diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune
@@ -10,6 +10,19 @@
# - build script start -
+check_static() {
+ local exe || true
+ exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1
+ if ! test -f $exe; then
+ printf '%s\n' "Error: file '$1' doesn't exist!"
+ exit 1
+ fi
+ interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
+ if test x '!=' "x$interp_info"; then
+ printf '%s\n' "Error: '$1' is a dynamic binary!"
+ exit 1
+ fi
+}
prefix=/home/ccx/versions/$pthbs_package
dest=${pthbs_destdir%/}${prefix}
cd 'dune-3.20.2'
diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base
@@ -4,7 +4,7 @@
#+busybox-awk.5c33e58d30be821f0a1fc8ba082d0a34aaecacad2a1c3a8f25b05cd07b2c6dec
#+busybox-diffutils.89043788a08f3d90f6fc1e02d690f6e5eefa88e11c61a1fae5048e457e46eb6f
#+ocaml.5b34db3f087fd067e8cf20c9806c599c52cf1d4564105f3841aa3594496ef578
-#+dune.f5fe904ba17842a93c636be4eada3636c0a2383424a9cb84a2cf9e76e0d1307e
+#+dune.37ab3bc1107904f825cd30c58a660280156d915b26ffb0e1991b27e7bb46d178
#@untar:-z:sha256:9bf9e503e2bd010325c7b0f5ae007ce1e5d3da61f0e06d2fbb64e9d12ccff93c:.
diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam
@@ -5,7 +5,7 @@
#+busybox-diffutils.89043788a08f3d90f6fc1e02d690f6e5eefa88e11c61a1fae5048e457e46eb6f
#+gnu-make.8b0f1b53392f1db9019f1d8e7ac20d3d9a58501db09a7ab0b2f81939fb4a81e3
#+ocaml.5b34db3f087fd067e8cf20c9806c599c52cf1d4564105f3841aa3594496ef578
-#+dune.f5fe904ba17842a93c636be4eada3636c0a2383424a9cb84a2cf9e76e0d1307e
+#+dune.37ab3bc1107904f825cd30c58a660280156d915b26ffb0e1991b27e7bb46d178
#@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
@@ -28,7 +28,7 @@ cd 'opam-2.4.1'
--infodir="$prefix/info" \
--localedir="$prefix/locale" \
--localstatedir='/var/pthbs' \
- --with-dune='/home/ccx/versions/dune.f5fe904ba17842a93c636be4eada3636c0a2383424a9cb84a2cf9e76e0d1307e/command/dune' \
+ --with-dune='/home/ccx/versions/dune.37ab3bc1107904f825cd30c58a660280156d915b26ffb0e1991b27e7bb46d178/command/dune' \
--with-mccs \
--with-vendored-deps
diff --git a/variants/ccx-x86_64/wip.environment b/variants/ccx-x86_64/wip.environment
@@ -1,6 +1,6 @@
#!/usr/bin/env pthbs-build
#+ocaml.5b34db3f087fd067e8cf20c9806c599c52cf1d4564105f3841aa3594496ef578
-#+dune.f5fe904ba17842a93c636be4eada3636c0a2383424a9cb84a2cf9e76e0d1307e
+#+dune.37ab3bc1107904f825cd30c58a660280156d915b26ffb0e1991b27e7bb46d178
#+ocamlbuild.bc0dcc5465fec021273e3aced8531c2c40c0d06249ce95766c14fdbd1e2b6608
-#+ocaml-base.21170da007be6a6f29658d9dcdc197b1d0b927e01003ccada6580a02046c562f
-#+opam.4dccea1afc0453e4b5764584ae28e999e3cd524eb3e2d92397a5d8e9141e67c9-
\ No newline at end of file
+#+ocaml-base.012e652d51d556f2bb397eaaf911732d7d862483ba3770f17cd8609e6fdb5136
+#+opam.8179119d69b49eeb2fc7d3bbf5267471a9c53c708b9685bb708fdb25af353423+
\ No newline at end of file
diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune
@@ -10,6 +10,19 @@
# - build script start -
+check_static() {
+ local exe || true
+ exe=$pthbs_destdir'/versions'/$pthbs_package/$1
+ if ! test -f $exe; then
+ printf '%s\n' "Error: file '$1' doesn't exist!"
+ exit 1
+ fi
+ interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
+ if test x '!=' "x$interp_info"; then
+ printf '%s\n' "Error: '$1' is a dynamic binary!"
+ exit 1
+ fi
+}
prefix=/versions/$pthbs_package
dest=${pthbs_destdir%/}${prefix}
cd 'dune-3.20.2'
diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base
@@ -4,7 +4,7 @@
#+busybox-awk.2db96ae9bd5ed9b9476bf92bb3bfae69caca475abd57385640428943edaa5fc5
#+busybox-diffutils.c5eee57596d172f36d2db9220e421b72e49a339032512dcaec3563e463e0786d
#+ocaml.7dac3082b76965ebaab371cfb7848a931581faf39bda33a9701667cb7503f802
-#+dune.ffdbaa9f0b8456ef4e1bb6991920a33ba8596413965924f93e5c62059ec1b745
+#+dune.45b7129519ec9237967ca5c6fbb697c4ff9ededdc017623a58e431a90f7b42be
#@untar:-z:sha256:9bf9e503e2bd010325c7b0f5ae007ce1e5d3da61f0e06d2fbb64e9d12ccff93c:.
diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam
@@ -5,7 +5,7 @@
#+busybox-diffutils.c5eee57596d172f36d2db9220e421b72e49a339032512dcaec3563e463e0786d
#+gnu-make.7c89ba8600db3ad1223a633a8783e077a4273e6371515d54d113a687898684c6
#+ocaml.7dac3082b76965ebaab371cfb7848a931581faf39bda33a9701667cb7503f802
-#+dune.ffdbaa9f0b8456ef4e1bb6991920a33ba8596413965924f93e5c62059ec1b745
+#+dune.45b7129519ec9237967ca5c6fbb697c4ff9ededdc017623a58e431a90f7b42be
#@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
@@ -28,7 +28,7 @@ cd 'opam-2.4.1'
--infodir="$prefix/info" \
--localedir="$prefix/locale" \
--localstatedir='/var/pthbs' \
- --with-dune='/versions/dune.ffdbaa9f0b8456ef4e1bb6991920a33ba8596413965924f93e5c62059ec1b745/command/dune' \
+ --with-dune='/versions/dune.45b7129519ec9237967ca5c6fbb697c4ff9ededdc017623a58e431a90f7b42be/command/dune' \
--with-mccs \
--with-vendored-deps
diff --git a/variants/root-x86_64/wip.environment b/variants/root-x86_64/wip.environment
@@ -1,6 +1,6 @@
#!/usr/bin/env pthbs-build
#+ocaml.7dac3082b76965ebaab371cfb7848a931581faf39bda33a9701667cb7503f802
-#+dune.ffdbaa9f0b8456ef4e1bb6991920a33ba8596413965924f93e5c62059ec1b745
+#+dune.45b7129519ec9237967ca5c6fbb697c4ff9ededdc017623a58e431a90f7b42be
#+ocamlbuild.7eaa6dc8723366dd4c460566e807f1740d9b422033342b8edf8a18eca72a2b10
-#+ocaml-base.71fe3ca5c58c797b20b9971792f4847fb1eebdc28ae2959b5990d8fa976fb375
-#+opam.27395c966c01c1ddb24495d4ae82cee60f78f98bbeff57457af2e352ebeb534c-
\ No newline at end of file
+#+ocaml-base.69d12d13b62d883b29079edf033c845ba92644fc072b08a46840e96b24d673ac
+#+opam.0c12521d05615c09dba24e2a72c7efc34532cc177039efed44022de6d153c9c4+
\ No newline at end of file
