commit 0cafca884e7879a85d22ee346d8c00c155af6e4a parent d709c8689a949dabcf4b9c89ddae7a3825ab6890 Author: Jan Pobrislo <ccx@te2000.cz> Date: Wed, 5 Nov 2025 01:08:55 +0000 ocaml packages Diffstat:
52 files changed, 233 insertions(+), 215 deletions(-)
diff --git a/templates/pkg/ocaml:dynlink b/templates/pkg/ocaml:dynlink @@ -3,7 +3,6 @@ {% extends "autotools" %} {%- do import_functions.update(["build_env_dynamic"]) %} {% do setitem(env_template, "OCAMLPATH", "@ENVROOT@/library.ocaml") %} -{% do setitem(env_template, "OCAMLPARAM", "I=@ENVROOT@/library.ocaml,_") %} {%- block configure %} build_env_dynamic autotools_config --enable-native-compiler --disable-native-toplevel --enable-installing-bytecode-programs --libdir="$prefix/library.ocaml" diff --git a/templates/pkg/ocamlbuild b/templates/pkg/ocamlbuild @@ -17,12 +17,21 @@ make configure \ OCAMLBUILD_LIBDIR="$prefix/library.ocaml" {% endblock configure %} +{% block install -%} +# workaround ocamlbuild manpage getting installed to stdlib directory +stdlib="$pthbs_destdir{{pkg_install_dir("ocaml:dynlink")}}" +mkdir -p "${stdlib%/*}" +ln -s "$pthbs_package" "$stdlib" + +{{ super() -}} +{% endblock install %} {% block check -%} check_dynamic command/ocamlbuild {% endblock check %} {% block genlinks_begin %} x["./command/ocamlbuild"]=1 + x["./man/man1/ocamlbuild.1"]=1 {% endblock genlinks_begin %} {% block genlinks_rules %} $2 == "library.ocaml" { link($0); next } diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune @@ -4,7 +4,7 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:. diff --git a/variants/ccx-x86_64/ocaml-astring b/variants/ccx-x86_64/ocaml-astring @@ -4,11 +4,11 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+ocaml-findlib.1bf730b77b8cf9ff66dfeb228567b345cae51d80b15e65fea974aa4ac1cbd745 -#+ocamlbuild.04c9926a93031f02e1389e7e516c533aa690afc097ddc84098b8afbfee74738e -#+opam.1bbf14f5b191646672139c10b611c698276df45ec69955c6180f0252b6cb2398 -#+ocaml-topkg.c53b9d7f33de7c8d9c250865c2c0f01132b31d8be35e5d52be42d5b01d5a646f +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+ocaml-findlib.7067086e4be4da3f608f8552cc9652d9e4237a0b4d4429cba31846baae0d9a48 +#+ocamlbuild.67716e335bbccfcc62cfc176cfcc6d71dfda615488f11b4ce2c7f9114724b36a +#+opam.05b08741e6383308453bd2b06a8534c63f68e722018757cecce9e23113dce4e1 +#+ocaml-topkg.91b7919ac0fdfa83cfa05b6b9ff7e4b456d7bcfdf24dace1ba7b7d7dc15b25c3 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:. diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base @@ -4,10 +4,10 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+dune.4b6b1f12335668460d152136c7b64ccc421cdbfd35070a70a7171bf804dd9440 -#+ocaml_intrinsics_kernel.861fb29a03dded5bb63dbf31b4894aa74da4873ce40a9ba5a9a4004e47441e5b -#+ocaml-sexplib0.d0d2fa06f2f732b4303ecc22ffb779a35fd976f5d632ba4056aa6d6ebd3fd5dc +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+dune.719e45c71e7a817678f24f6c8aaf6c9748ec7a1f52678e30c614ca0e71b11e59 +#+ocaml_intrinsics_kernel.047bfac7e669970d38a09d6cf218c11fad955f3f9b0efb9e671eb1aba538ccb7 +#+ocaml-sexplib0.5a396e17cd1b3f161906e3f391456d8d87e3e7e974ee2e1d805a0cd91f3ddd0c #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:. diff --git a/variants/ccx-x86_64/ocaml-bos b/variants/ccx-x86_64/ocaml-bos @@ -4,17 +4,17 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+ocaml-findlib.1bf730b77b8cf9ff66dfeb228567b345cae51d80b15e65fea974aa4ac1cbd745 -#+ocamlbuild.04c9926a93031f02e1389e7e516c533aa690afc097ddc84098b8afbfee74738e -#+opam.1bbf14f5b191646672139c10b611c698276df45ec69955c6180f0252b6cb2398 -#+ocaml-topkg.c53b9d7f33de7c8d9c250865c2c0f01132b31d8be35e5d52be42d5b01d5a646f -#+ocaml-astring.6ea2ae7a5438ab9eacfa75eb73ce3f6110be01936f07ca6bb9a36d464cf9ec04 -#+ocaml-fpath.e6910914865af967b029c0b1972fbfa53adb023ca7397c1c9e92eca051b01f9b -#+ocaml-rresult.0567951279890620c7505fdc773f22a78cb0b70f267e9d3f6f0c51e1818b1293 -#+ocaml-fmt.4231d967915ff05851b32fc7c8b7c1c522ff85af2ad2d6e3e9fa5608e44bfeaf -#+ocaml-logs.8f1462b3d39519679036c038bd2f602295106119a4c9fd70759006f0c5b57f98 -#+ocaml-mtime.0e57903280d66bfdc1904d811069c398c8387c65c6e1d75e99f46114cc5498dd +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+ocaml-findlib.7067086e4be4da3f608f8552cc9652d9e4237a0b4d4429cba31846baae0d9a48 +#+ocamlbuild.67716e335bbccfcc62cfc176cfcc6d71dfda615488f11b4ce2c7f9114724b36a +#+opam.05b08741e6383308453bd2b06a8534c63f68e722018757cecce9e23113dce4e1 +#+ocaml-topkg.91b7919ac0fdfa83cfa05b6b9ff7e4b456d7bcfdf24dace1ba7b7d7dc15b25c3 +#+ocaml-astring.719d7e0dcdd7afbde35c55fed86b62f4587e2283d7685a92084ce5e3f81dd232 +#+ocaml-fpath.07df29b81c2abe259a332c32432ba7d2fd029ff05fc1354c3f5d2c9a9968538f +#+ocaml-rresult.3a9b5f4d591b8c5833d637c871d5804584e24168e64b3014d79f675bd5962ada +#+ocaml-fmt.1575a538a24ce70cfc148791c059fd330eadb01c10a67495cca80b0a97dc45b1 +#+ocaml-logs.936bde3fc4fab5fb1293b3efadee44a662fd2574616172d6306463cc9ae10529 +#+ocaml-mtime.0256eee5fd1c1c7c3c39cd37506be1226faac4588a173b00e3e4e163b696cdc5 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:. diff --git a/variants/ccx-x86_64/ocaml-cmdliner b/variants/ccx-x86_64/ocaml-cmdliner @@ -4,11 +4,11 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+ocaml-findlib.1bf730b77b8cf9ff66dfeb228567b345cae51d80b15e65fea974aa4ac1cbd745 -#+ocamlbuild.04c9926a93031f02e1389e7e516c533aa690afc097ddc84098b8afbfee74738e -#+opam.1bbf14f5b191646672139c10b611c698276df45ec69955c6180f0252b6cb2398 -#+ocaml-topkg.c53b9d7f33de7c8d9c250865c2c0f01132b31d8be35e5d52be42d5b01d5a646f +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+ocaml-findlib.7067086e4be4da3f608f8552cc9652d9e4237a0b4d4429cba31846baae0d9a48 +#+ocamlbuild.67716e335bbccfcc62cfc176cfcc6d71dfda615488f11b4ce2c7f9114724b36a +#+opam.05b08741e6383308453bd2b06a8534c63f68e722018757cecce9e23113dce4e1 +#+ocaml-topkg.91b7919ac0fdfa83cfa05b6b9ff7e4b456d7bcfdf24dace1ba7b7d7dc15b25c3 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:. diff --git a/variants/ccx-x86_64/ocaml-compiler-libs b/variants/ccx-x86_64/ocaml-compiler-libs @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+dune.4b6b1f12335668460d152136c7b64ccc421cdbfd35070a70a7171bf804dd9440 +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+dune.719e45c71e7a817678f24f6c8aaf6c9748ec7a1f52678e30c614ca0e71b11e59 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:. diff --git a/variants/ccx-x86_64/ocaml-cppo b/variants/ccx-x86_64/ocaml-cppo @@ -4,9 +4,9 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+dune.4b6b1f12335668460d152136c7b64ccc421cdbfd35070a70a7171bf804dd9440 -#+ocamlbuild.04c9926a93031f02e1389e7e516c533aa690afc097ddc84098b8afbfee74738e +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+dune.719e45c71e7a817678f24f6c8aaf6c9748ec7a1f52678e30c614ca0e71b11e59 +#+ocamlbuild.67716e335bbccfcc62cfc176cfcc6d71dfda615488f11b4ce2c7f9114724b36a #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:. diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib @@ -7,8 +7,8 @@ #+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #+netbsd-curses.602505ed434c46abbdf43553127f96497f63866c823d5e45cdede00f3ffa29bb -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+ocamlbuild.04c9926a93031f02e1389e7e516c533aa690afc097ddc84098b8afbfee74738e +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+ocamlbuild.67716e335bbccfcc62cfc176cfcc6d71dfda615488f11b4ce2c7f9114724b36a #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:. @@ -54,7 +54,7 @@ cd 'findlib-1.9.8' make -j1 all opt # workaround `topfind` getting installed to stdlib directory, this is not configurable -stdlib="$pthbs_destdir/home/ccx/versions/ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc" +stdlib="$pthbs_destdir/home/ccx/versions/ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84" mkdir -p "${stdlib%/*}" ln -s "$pthbs_package" "$stdlib" make install prefix="$pthbs_destdir" diff --git a/variants/ccx-x86_64/ocaml-fmt b/variants/ccx-x86_64/ocaml-fmt @@ -4,12 +4,12 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+ocaml-findlib.1bf730b77b8cf9ff66dfeb228567b345cae51d80b15e65fea974aa4ac1cbd745 -#+ocamlbuild.04c9926a93031f02e1389e7e516c533aa690afc097ddc84098b8afbfee74738e -#+opam.1bbf14f5b191646672139c10b611c698276df45ec69955c6180f0252b6cb2398 -#+ocaml-topkg.c53b9d7f33de7c8d9c250865c2c0f01132b31d8be35e5d52be42d5b01d5a646f -#+ocaml-cmdliner.ca092db6b48d7941dcdd43bae2196bf85ccf06d3f9f093c290f4661f96ccfa73 +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+ocaml-findlib.7067086e4be4da3f608f8552cc9652d9e4237a0b4d4429cba31846baae0d9a48 +#+ocamlbuild.67716e335bbccfcc62cfc176cfcc6d71dfda615488f11b4ce2c7f9114724b36a +#+opam.05b08741e6383308453bd2b06a8534c63f68e722018757cecce9e23113dce4e1 +#+ocaml-topkg.91b7919ac0fdfa83cfa05b6b9ff7e4b456d7bcfdf24dace1ba7b7d7dc15b25c3 +#+ocaml-cmdliner.2ee6e497439869f3685450456164f093a721e6f9210f99dbee0e9b7b1b4da925 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:. diff --git a/variants/ccx-x86_64/ocaml-fpath b/variants/ccx-x86_64/ocaml-fpath @@ -4,12 +4,12 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+ocaml-findlib.1bf730b77b8cf9ff66dfeb228567b345cae51d80b15e65fea974aa4ac1cbd745 -#+ocamlbuild.04c9926a93031f02e1389e7e516c533aa690afc097ddc84098b8afbfee74738e -#+opam.1bbf14f5b191646672139c10b611c698276df45ec69955c6180f0252b6cb2398 -#+ocaml-topkg.c53b9d7f33de7c8d9c250865c2c0f01132b31d8be35e5d52be42d5b01d5a646f -#+ocaml-astring.6ea2ae7a5438ab9eacfa75eb73ce3f6110be01936f07ca6bb9a36d464cf9ec04 +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+ocaml-findlib.7067086e4be4da3f608f8552cc9652d9e4237a0b4d4429cba31846baae0d9a48 +#+ocamlbuild.67716e335bbccfcc62cfc176cfcc6d71dfda615488f11b4ce2c7f9114724b36a +#+opam.05b08741e6383308453bd2b06a8534c63f68e722018757cecce9e23113dce4e1 +#+ocaml-topkg.91b7919ac0fdfa83cfa05b6b9ff7e4b456d7bcfdf24dace1ba7b7d7dc15b25c3 +#+ocaml-astring.719d7e0dcdd7afbde35c55fed86b62f4587e2283d7685a92084ce5e3f81dd232 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:. diff --git a/variants/ccx-x86_64/ocaml-logs b/variants/ccx-x86_64/ocaml-logs @@ -4,14 +4,14 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+ocaml-findlib.1bf730b77b8cf9ff66dfeb228567b345cae51d80b15e65fea974aa4ac1cbd745 -#+ocamlbuild.04c9926a93031f02e1389e7e516c533aa690afc097ddc84098b8afbfee74738e -#+opam.1bbf14f5b191646672139c10b611c698276df45ec69955c6180f0252b6cb2398 -#+ocaml-topkg.c53b9d7f33de7c8d9c250865c2c0f01132b31d8be35e5d52be42d5b01d5a646f -#+ocaml-mtime.0e57903280d66bfdc1904d811069c398c8387c65c6e1d75e99f46114cc5498dd -#+ocaml-cmdliner.ca092db6b48d7941dcdd43bae2196bf85ccf06d3f9f093c290f4661f96ccfa73 -#+ocaml-fmt.4231d967915ff05851b32fc7c8b7c1c522ff85af2ad2d6e3e9fa5608e44bfeaf +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+ocaml-findlib.7067086e4be4da3f608f8552cc9652d9e4237a0b4d4429cba31846baae0d9a48 +#+ocamlbuild.67716e335bbccfcc62cfc176cfcc6d71dfda615488f11b4ce2c7f9114724b36a +#+opam.05b08741e6383308453bd2b06a8534c63f68e722018757cecce9e23113dce4e1 +#+ocaml-topkg.91b7919ac0fdfa83cfa05b6b9ff7e4b456d7bcfdf24dace1ba7b7d7dc15b25c3 +#+ocaml-mtime.0256eee5fd1c1c7c3c39cd37506be1226faac4588a173b00e3e4e163b696cdc5 +#+ocaml-cmdliner.2ee6e497439869f3685450456164f093a721e6f9210f99dbee0e9b7b1b4da925 +#+ocaml-fmt.1575a538a24ce70cfc148791c059fd330eadb01c10a67495cca80b0a97dc45b1 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:. diff --git a/variants/ccx-x86_64/ocaml-lun b/variants/ccx-x86_64/ocaml-lun @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+dune.4b6b1f12335668460d152136c7b64ccc421cdbfd35070a70a7171bf804dd9440 +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+dune.719e45c71e7a817678f24f6c8aaf6c9748ec7a1f52678e30c614ca0e71b11e59 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:. diff --git a/variants/ccx-x86_64/ocaml-mtime b/variants/ccx-x86_64/ocaml-mtime @@ -4,11 +4,11 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+ocaml-findlib.1bf730b77b8cf9ff66dfeb228567b345cae51d80b15e65fea974aa4ac1cbd745 -#+ocamlbuild.04c9926a93031f02e1389e7e516c533aa690afc097ddc84098b8afbfee74738e -#+opam.1bbf14f5b191646672139c10b611c698276df45ec69955c6180f0252b6cb2398 -#+ocaml-topkg.c53b9d7f33de7c8d9c250865c2c0f01132b31d8be35e5d52be42d5b01d5a646f +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+ocaml-findlib.7067086e4be4da3f608f8552cc9652d9e4237a0b4d4429cba31846baae0d9a48 +#+ocamlbuild.67716e335bbccfcc62cfc176cfcc6d71dfda615488f11b4ce2c7f9114724b36a +#+opam.05b08741e6383308453bd2b06a8534c63f68e722018757cecce9e23113dce4e1 +#+ocaml-topkg.91b7919ac0fdfa83cfa05b6b9ff7e4b456d7bcfdf24dace1ba7b7d7dc15b25c3 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:. diff --git a/variants/ccx-x86_64/ocaml-ppx_derivers b/variants/ccx-x86_64/ocaml-ppx_derivers @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+dune.4b6b1f12335668460d152136c7b64ccc421cdbfd35070a70a7171bf804dd9440 +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+dune.719e45c71e7a817678f24f6c8aaf6c9748ec7a1f52678e30c614ca0e71b11e59 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:. diff --git a/variants/ccx-x86_64/ocaml-ppx_deriving b/variants/ccx-x86_64/ocaml-ppx_deriving @@ -4,15 +4,15 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+dune.4b6b1f12335668460d152136c7b64ccc421cdbfd35070a70a7171bf804dd9440 -#+ocaml-compiler-libs.5236a9316927632214c765a2ba701d656c952810b5cf64c184013ba1a34d7c0d -#+ocaml-cppo.a98d46572da552fbbd67d011bb0e3b3279c78fa037c5f9ec928d129be8a9e3ea -#+ocaml-findlib.1bf730b77b8cf9ff66dfeb228567b345cae51d80b15e65fea974aa4ac1cbd745 -#+ocaml-ppx_derivers.e3700a43969830fff9d1c208742d7973b3ee96febfcd9448cd5c4eede944436d -#+ocaml-ppxlib.134890c03837edc73eb497d191ad597ee3522e426161dc4688d1000f4666ef74 -#+ocaml-sexplib0.d0d2fa06f2f732b4303ecc22ffb779a35fd976f5d632ba4056aa6d6ebd3fd5dc -#+ocaml-stdlib-shims.4b9fa137577eefed8c880c342ef9feeaabce97122db524b66c3353c55a8e84a4 +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+dune.719e45c71e7a817678f24f6c8aaf6c9748ec7a1f52678e30c614ca0e71b11e59 +#+ocaml-compiler-libs.73b232b1691f4458d370486a5ccf7f95b2bc8d55ee55d40c8cbe552ae2e8f7e2 +#+ocaml-cppo.484fd33e752e296027e7649733085080e211a7d2b3739a77f4bb30f77efd9ba9 +#+ocaml-findlib.7067086e4be4da3f608f8552cc9652d9e4237a0b4d4429cba31846baae0d9a48 +#+ocaml-ppx_derivers.9f762b179880ee85b02dbdcf88e8648b4fbb73e23bd4549203a143430c13fb4b +#+ocaml-ppxlib.bba135e84aa85573e545abe2d58ada54d92661599be24683515ef02009913291 +#+ocaml-sexplib0.5a396e17cd1b3f161906e3f391456d8d87e3e7e974ee2e1d805a0cd91f3ddd0c +#+ocaml-stdlib-shims.6e5b54873ab6bc0ea943776a4c14071c8de2ff30414167ba1477e7165bd6d4c7 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:. diff --git a/variants/ccx-x86_64/ocaml-ppxlib b/variants/ccx-x86_64/ocaml-ppxlib @@ -4,12 +4,12 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+dune.4b6b1f12335668460d152136c7b64ccc421cdbfd35070a70a7171bf804dd9440 -#+ocaml-compiler-libs.5236a9316927632214c765a2ba701d656c952810b5cf64c184013ba1a34d7c0d -#+ocaml-ppx_derivers.e3700a43969830fff9d1c208742d7973b3ee96febfcd9448cd5c4eede944436d -#+ocaml-sexplib0.d0d2fa06f2f732b4303ecc22ffb779a35fd976f5d632ba4056aa6d6ebd3fd5dc -#+ocaml-stdlib-shims.4b9fa137577eefed8c880c342ef9feeaabce97122db524b66c3353c55a8e84a4 +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+dune.719e45c71e7a817678f24f6c8aaf6c9748ec7a1f52678e30c614ca0e71b11e59 +#+ocaml-compiler-libs.73b232b1691f4458d370486a5ccf7f95b2bc8d55ee55d40c8cbe552ae2e8f7e2 +#+ocaml-ppx_derivers.9f762b179880ee85b02dbdcf88e8648b4fbb73e23bd4549203a143430c13fb4b +#+ocaml-sexplib0.5a396e17cd1b3f161906e3f391456d8d87e3e7e974ee2e1d805a0cd91f3ddd0c +#+ocaml-stdlib-shims.6e5b54873ab6bc0ea943776a4c14071c8de2ff30414167ba1477e7165bd6d4c7 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:. diff --git a/variants/ccx-x86_64/ocaml-rresult b/variants/ccx-x86_64/ocaml-rresult @@ -4,11 +4,11 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+ocaml-findlib.1bf730b77b8cf9ff66dfeb228567b345cae51d80b15e65fea974aa4ac1cbd745 -#+ocamlbuild.04c9926a93031f02e1389e7e516c533aa690afc097ddc84098b8afbfee74738e -#+opam.1bbf14f5b191646672139c10b611c698276df45ec69955c6180f0252b6cb2398 -#+ocaml-topkg.c53b9d7f33de7c8d9c250865c2c0f01132b31d8be35e5d52be42d5b01d5a646f +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+ocaml-findlib.7067086e4be4da3f608f8552cc9652d9e4237a0b4d4429cba31846baae0d9a48 +#+ocamlbuild.67716e335bbccfcc62cfc176cfcc6d71dfda615488f11b4ce2c7f9114724b36a +#+opam.05b08741e6383308453bd2b06a8534c63f68e722018757cecce9e23113dce4e1 +#+ocaml-topkg.91b7919ac0fdfa83cfa05b6b9ff7e4b456d7bcfdf24dace1ba7b7d7dc15b25c3 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:. diff --git a/variants/ccx-x86_64/ocaml-sexplib0 b/variants/ccx-x86_64/ocaml-sexplib0 @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+dune.4b6b1f12335668460d152136c7b64ccc421cdbfd35070a70a7171bf804dd9440 +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+dune.719e45c71e7a817678f24f6c8aaf6c9748ec7a1f52678e30c614ca0e71b11e59 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:. diff --git a/variants/ccx-x86_64/ocaml-stdlib-shims b/variants/ccx-x86_64/ocaml-stdlib-shims @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+dune.4b6b1f12335668460d152136c7b64ccc421cdbfd35070a70a7171bf804dd9440 +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+dune.719e45c71e7a817678f24f6c8aaf6c9748ec7a1f52678e30c614ca0e71b11e59 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:. diff --git a/variants/ccx-x86_64/ocaml-topkg b/variants/ccx-x86_64/ocaml-topkg @@ -4,10 +4,10 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+ocaml-findlib.1bf730b77b8cf9ff66dfeb228567b345cae51d80b15e65fea974aa4ac1cbd745 -#+ocamlbuild.04c9926a93031f02e1389e7e516c533aa690afc097ddc84098b8afbfee74738e -#+opam.1bbf14f5b191646672139c10b611c698276df45ec69955c6180f0252b6cb2398 +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+ocaml-findlib.7067086e4be4da3f608f8552cc9652d9e4237a0b4d4429cba31846baae0d9a48 +#+ocamlbuild.67716e335bbccfcc62cfc176cfcc6d71dfda615488f11b4ce2c7f9114724b36a +#+opam.05b08741e6383308453bd2b06a8534c63f68e722018757cecce9e23113dce4e1 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:. diff --git a/variants/ccx-x86_64/ocaml:dynlink b/variants/ccx-x86_64/ocaml:dynlink @@ -58,7 +58,6 @@ make DESTDIR="$pthbs_destdir" install mkdir -p "$dest/.env-template" -printf '%s' >"$dest/.env-template"/'OCAMLPARAM' 'I=@ENVROOT@/library.ocaml,_' printf '%s' >"$dest/.env-template"/'OCAMLPATH' '@ENVROOT@/library.ocaml' cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/ocaml_intrinsics_kernel b/variants/ccx-x86_64/ocaml_intrinsics_kernel @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+dune.4b6b1f12335668460d152136c7b64ccc421cdbfd35070a70a7171bf804dd9440 +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+dune.719e45c71e7a817678f24f6c8aaf6c9748ec7a1f52678e30c614ca0e71b11e59 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:. diff --git a/variants/ccx-x86_64/ocamlbuild b/variants/ccx-x86_64/ocamlbuild @@ -6,7 +6,7 @@ #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:. @@ -49,6 +49,11 @@ make configure \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) +# workaround ocamlbuild manpage getting installed to stdlib directory +stdlib="$pthbs_destdir/home/ccx/versions/ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84" +mkdir -p "${stdlib%/*}" +ln -s "$pthbs_package" "$stdlib" + make DESTDIR="$pthbs_destdir" install @@ -61,6 +66,7 @@ cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./command/ocamlbuild"]=1 + x["./man/man1/ocamlbuild.1"]=1 } function r1(s) { diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam @@ -7,8 +7,8 @@ #+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #+getconf.1756f266a6e2a6ba1d5264b7a0048bea66e45f80640e68aa284a621762525702 -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+dune.4b6b1f12335668460d152136c7b64ccc421cdbfd35070a70a7171bf804dd9440 +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+dune.719e45c71e7a817678f24f6c8aaf6c9748ec7a1f52678e30c614ca0e71b11e59 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:. @@ -47,7 +47,7 @@ export DUNE_CACHE=disabled --infodir="$prefix/info" \ --localedir="$prefix/locale" \ --localstatedir='/var/pthbs' \ - --with-dune='/home/ccx/versions/dune.4b6b1f12335668460d152136c7b64ccc421cdbfd35070a70a7171bf804dd9440/command/dune' \ + --with-dune='/home/ccx/versions/dune.719e45c71e7a817678f24f6c8aaf6c9748ec7a1f52678e30c614ca0e71b11e59/command/dune' \ --with-mccs \ --with-vendored-deps \ --enable-static diff --git a/variants/ccx-x86_64/wip.environment b/variants/ccx-x86_64/wip.environment @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc -#+dune.4b6b1f12335668460d152136c7b64ccc421cdbfd35070a70a7171bf804dd9440 -#+ocamlbuild.04c9926a93031f02e1389e7e516c533aa690afc097ddc84098b8afbfee74738e -#+ocaml-base.163059a1a4d6a06ea71c008d16a2d32753da5ec245ab2e304e0316437a92f30a -#+opam.1bbf14f5b191646672139c10b611c698276df45ec69955c6180f0252b6cb2398 -#+ocaml-bos.62a27c3b77c0ecb44ac98c6699b305f198631e5ef0eb57ebe8dfeadb36e7ff3d -#+ocaml-lun.3b3e4e1991028fced35e8a3e1919f760f8a822351510ad9df888dcb02203ff07 -#+ocaml-ppx_deriving.184b9bca90800cfe258fa7cde4d2e7f70f3e215568b661f384f62f94608213eb- \ No newline at end of file +#+ocaml.2b45f4943dfc7eadb74e5e9d5efb07064ba9d88e5a31ef20b575d04ac773be84 +#+dune.719e45c71e7a817678f24f6c8aaf6c9748ec7a1f52678e30c614ca0e71b11e59 +#+ocamlbuild.67716e335bbccfcc62cfc176cfcc6d71dfda615488f11b4ce2c7f9114724b36a +#+ocaml-base.8d069fdd352c63427bd4f7102d12be79db1c8628d606df3a1cffa65e4be4af3d +#+opam.05b08741e6383308453bd2b06a8534c63f68e722018757cecce9e23113dce4e1 +#+ocaml-bos.aeed01c588264c55d8a1caa48dccf016a5c86194c91baa30fa6f608375f042e0 +#+ocaml-lun.56c3697ea4cbe409c249f4e0d98fd3cbf97369b0bf440aa6a7870d778fc7f12e +#+ocaml-ppx_deriving.8c128185842c93876e476a58480adce11fd0efa99c271cdc67e50719da001f71+ \ No newline at end of file diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune @@ -4,7 +4,7 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:. diff --git a/variants/root-x86_64/ocaml-astring b/variants/root-x86_64/ocaml-astring @@ -4,11 +4,11 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+ocaml-findlib.c61f44946368c4e5a662f4acc956745078c5a164fc9f5464b1fbc8fefb7e1a42 -#+ocamlbuild.ec8d0709f4f2feda206ea4c4e2a4e8f937cc8ea5e8744dac5b8981a245dbd87b -#+opam.38f724f22cd2d0cc8b2f406ce402648178122eed4a2c9e24fbd6f0f582f360ca -#+ocaml-topkg.bf0fffcfd6438a7dd604e99da0e4bb1d424451fd080eb4098742b442a8707bf6 +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+ocaml-findlib.9867e07edff9239f9dd1384cdb290a5e2e1f7f5456b6e524cb83596a6dbab610 +#+ocamlbuild.fcbe620de239164f3862ac9d0e6ba7a01f0ab7a2342989e386f842903804e01c +#+opam.8dbd74c033bf6c129ad36a9e7ef988b9019d762fc3280724a933a26c7a59b117 +#+ocaml-topkg.4530fcbaba0f2c8e0abda8a6d8d50dd30fe36719befcea8e2b49be258927bb7f #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:. diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base @@ -4,10 +4,10 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+dune.be5001ce5cb88a87d61044499f7436e14280c54971a91c7553b465498786150e -#+ocaml_intrinsics_kernel.d2e212d82470cba025e3de31f83519744ce2358feb5f746177c422946dd4853e -#+ocaml-sexplib0.f36727db00e34e237bfd1ff2e1cf6df354113f6f7b1f9611253ad028b58727b6 +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+dune.43a061d87064657f66873e171dbe9ceaa78f9ece8829e1f724df01f0acb0c2f5 +#+ocaml_intrinsics_kernel.0fbe2ca52d2fe2dd914a628fa54dd4e493c2e054633d7ad0a9dc82a5b1045ee3 +#+ocaml-sexplib0.b44e27cd3fe019385b5e410ea35642bcb2e8873fc875a32703ef902b76e96c48 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:. diff --git a/variants/root-x86_64/ocaml-bos b/variants/root-x86_64/ocaml-bos @@ -4,17 +4,17 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+ocaml-findlib.c61f44946368c4e5a662f4acc956745078c5a164fc9f5464b1fbc8fefb7e1a42 -#+ocamlbuild.ec8d0709f4f2feda206ea4c4e2a4e8f937cc8ea5e8744dac5b8981a245dbd87b -#+opam.38f724f22cd2d0cc8b2f406ce402648178122eed4a2c9e24fbd6f0f582f360ca -#+ocaml-topkg.bf0fffcfd6438a7dd604e99da0e4bb1d424451fd080eb4098742b442a8707bf6 -#+ocaml-astring.1935ef4f4ba9cfeb5a273a0e64de1cb3d4d10a4a5395867baf6bf6b2459f7902 -#+ocaml-fpath.55469dbff6287df2ca73a91b9ed21a26d39a291a83e057d33603af8b7853644f -#+ocaml-rresult.18cf9afb8fb25fdbc30f61859ccceb7b4e37efb13e91553924117832b44c2832 -#+ocaml-fmt.39069670505d40f687b2bea1a6745f95819f523cbaf73494ea6c5f70e7b2b029 -#+ocaml-logs.dc14b91cfc5a90b3338a473885ff6a206a363bbc81cbb4e8cc4b0c3db6b0d394 -#+ocaml-mtime.986a0b86e4a1ca2431c516a2da9112bcac715f34a5e05fd5db4dc0f1d4515b22 +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+ocaml-findlib.9867e07edff9239f9dd1384cdb290a5e2e1f7f5456b6e524cb83596a6dbab610 +#+ocamlbuild.fcbe620de239164f3862ac9d0e6ba7a01f0ab7a2342989e386f842903804e01c +#+opam.8dbd74c033bf6c129ad36a9e7ef988b9019d762fc3280724a933a26c7a59b117 +#+ocaml-topkg.4530fcbaba0f2c8e0abda8a6d8d50dd30fe36719befcea8e2b49be258927bb7f +#+ocaml-astring.5573cc620b3bf111d6c74690ac1ca485e61c88109eb3e237133ab734544347a9 +#+ocaml-fpath.9f093dc54fc1f5c8fc5663e2f9da8ea0e946f81bca45e20e6f8bcc977a2bbdef +#+ocaml-rresult.7453d620c63b62053070484e6c6bef58a4a6b422a507e709cb2f4a8464d41d9a +#+ocaml-fmt.18f0c141f17d8bbcdc85882c7bf86bb5fe8273452a3e9111ecc04c538bac0ef8 +#+ocaml-logs.4d9c52e7a82adadccde4e05aa39b237791a0bcb43f9f56126ba1a890a045bf0a +#+ocaml-mtime.6d6ddbfd56e211af4154613d62e6d5c1efd4682df583e4ff23a877f928994d82 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:. diff --git a/variants/root-x86_64/ocaml-cmdliner b/variants/root-x86_64/ocaml-cmdliner @@ -4,11 +4,11 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+ocaml-findlib.c61f44946368c4e5a662f4acc956745078c5a164fc9f5464b1fbc8fefb7e1a42 -#+ocamlbuild.ec8d0709f4f2feda206ea4c4e2a4e8f937cc8ea5e8744dac5b8981a245dbd87b -#+opam.38f724f22cd2d0cc8b2f406ce402648178122eed4a2c9e24fbd6f0f582f360ca -#+ocaml-topkg.bf0fffcfd6438a7dd604e99da0e4bb1d424451fd080eb4098742b442a8707bf6 +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+ocaml-findlib.9867e07edff9239f9dd1384cdb290a5e2e1f7f5456b6e524cb83596a6dbab610 +#+ocamlbuild.fcbe620de239164f3862ac9d0e6ba7a01f0ab7a2342989e386f842903804e01c +#+opam.8dbd74c033bf6c129ad36a9e7ef988b9019d762fc3280724a933a26c7a59b117 +#+ocaml-topkg.4530fcbaba0f2c8e0abda8a6d8d50dd30fe36719befcea8e2b49be258927bb7f #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:. diff --git a/variants/root-x86_64/ocaml-compiler-libs b/variants/root-x86_64/ocaml-compiler-libs @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+dune.be5001ce5cb88a87d61044499f7436e14280c54971a91c7553b465498786150e +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+dune.43a061d87064657f66873e171dbe9ceaa78f9ece8829e1f724df01f0acb0c2f5 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:. diff --git a/variants/root-x86_64/ocaml-cppo b/variants/root-x86_64/ocaml-cppo @@ -4,9 +4,9 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+dune.be5001ce5cb88a87d61044499f7436e14280c54971a91c7553b465498786150e -#+ocamlbuild.ec8d0709f4f2feda206ea4c4e2a4e8f937cc8ea5e8744dac5b8981a245dbd87b +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+dune.43a061d87064657f66873e171dbe9ceaa78f9ece8829e1f724df01f0acb0c2f5 +#+ocamlbuild.fcbe620de239164f3862ac9d0e6ba7a01f0ab7a2342989e386f842903804e01c #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:. diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib @@ -7,8 +7,8 @@ #+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #+netbsd-curses.809febf41c26259736b072fcda38189d305faef167fc77b9a9ae101de7141066 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+ocamlbuild.ec8d0709f4f2feda206ea4c4e2a4e8f937cc8ea5e8744dac5b8981a245dbd87b +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+ocamlbuild.fcbe620de239164f3862ac9d0e6ba7a01f0ab7a2342989e386f842903804e01c #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:. @@ -54,7 +54,7 @@ cd 'findlib-1.9.8' make -j1 all opt # workaround `topfind` getting installed to stdlib directory, this is not configurable -stdlib="$pthbs_destdir/versions/ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b" +stdlib="$pthbs_destdir/versions/ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964" mkdir -p "${stdlib%/*}" ln -s "$pthbs_package" "$stdlib" make install prefix="$pthbs_destdir" diff --git a/variants/root-x86_64/ocaml-fmt b/variants/root-x86_64/ocaml-fmt @@ -4,12 +4,12 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+ocaml-findlib.c61f44946368c4e5a662f4acc956745078c5a164fc9f5464b1fbc8fefb7e1a42 -#+ocamlbuild.ec8d0709f4f2feda206ea4c4e2a4e8f937cc8ea5e8744dac5b8981a245dbd87b -#+opam.38f724f22cd2d0cc8b2f406ce402648178122eed4a2c9e24fbd6f0f582f360ca -#+ocaml-topkg.bf0fffcfd6438a7dd604e99da0e4bb1d424451fd080eb4098742b442a8707bf6 -#+ocaml-cmdliner.2d98615c89b48fc9c49da77cd8c7f082eb54b606eddb7e956a30dd4d824f602d +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+ocaml-findlib.9867e07edff9239f9dd1384cdb290a5e2e1f7f5456b6e524cb83596a6dbab610 +#+ocamlbuild.fcbe620de239164f3862ac9d0e6ba7a01f0ab7a2342989e386f842903804e01c +#+opam.8dbd74c033bf6c129ad36a9e7ef988b9019d762fc3280724a933a26c7a59b117 +#+ocaml-topkg.4530fcbaba0f2c8e0abda8a6d8d50dd30fe36719befcea8e2b49be258927bb7f +#+ocaml-cmdliner.9ff8f2014829ebd9f35e77e7084cb700f408fe6f2da6c0e321d1d8c9f8a50d89 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:. diff --git a/variants/root-x86_64/ocaml-fpath b/variants/root-x86_64/ocaml-fpath @@ -4,12 +4,12 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+ocaml-findlib.c61f44946368c4e5a662f4acc956745078c5a164fc9f5464b1fbc8fefb7e1a42 -#+ocamlbuild.ec8d0709f4f2feda206ea4c4e2a4e8f937cc8ea5e8744dac5b8981a245dbd87b -#+opam.38f724f22cd2d0cc8b2f406ce402648178122eed4a2c9e24fbd6f0f582f360ca -#+ocaml-topkg.bf0fffcfd6438a7dd604e99da0e4bb1d424451fd080eb4098742b442a8707bf6 -#+ocaml-astring.1935ef4f4ba9cfeb5a273a0e64de1cb3d4d10a4a5395867baf6bf6b2459f7902 +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+ocaml-findlib.9867e07edff9239f9dd1384cdb290a5e2e1f7f5456b6e524cb83596a6dbab610 +#+ocamlbuild.fcbe620de239164f3862ac9d0e6ba7a01f0ab7a2342989e386f842903804e01c +#+opam.8dbd74c033bf6c129ad36a9e7ef988b9019d762fc3280724a933a26c7a59b117 +#+ocaml-topkg.4530fcbaba0f2c8e0abda8a6d8d50dd30fe36719befcea8e2b49be258927bb7f +#+ocaml-astring.5573cc620b3bf111d6c74690ac1ca485e61c88109eb3e237133ab734544347a9 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:. diff --git a/variants/root-x86_64/ocaml-logs b/variants/root-x86_64/ocaml-logs @@ -4,14 +4,14 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+ocaml-findlib.c61f44946368c4e5a662f4acc956745078c5a164fc9f5464b1fbc8fefb7e1a42 -#+ocamlbuild.ec8d0709f4f2feda206ea4c4e2a4e8f937cc8ea5e8744dac5b8981a245dbd87b -#+opam.38f724f22cd2d0cc8b2f406ce402648178122eed4a2c9e24fbd6f0f582f360ca -#+ocaml-topkg.bf0fffcfd6438a7dd604e99da0e4bb1d424451fd080eb4098742b442a8707bf6 -#+ocaml-mtime.986a0b86e4a1ca2431c516a2da9112bcac715f34a5e05fd5db4dc0f1d4515b22 -#+ocaml-cmdliner.2d98615c89b48fc9c49da77cd8c7f082eb54b606eddb7e956a30dd4d824f602d -#+ocaml-fmt.39069670505d40f687b2bea1a6745f95819f523cbaf73494ea6c5f70e7b2b029 +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+ocaml-findlib.9867e07edff9239f9dd1384cdb290a5e2e1f7f5456b6e524cb83596a6dbab610 +#+ocamlbuild.fcbe620de239164f3862ac9d0e6ba7a01f0ab7a2342989e386f842903804e01c +#+opam.8dbd74c033bf6c129ad36a9e7ef988b9019d762fc3280724a933a26c7a59b117 +#+ocaml-topkg.4530fcbaba0f2c8e0abda8a6d8d50dd30fe36719befcea8e2b49be258927bb7f +#+ocaml-mtime.6d6ddbfd56e211af4154613d62e6d5c1efd4682df583e4ff23a877f928994d82 +#+ocaml-cmdliner.9ff8f2014829ebd9f35e77e7084cb700f408fe6f2da6c0e321d1d8c9f8a50d89 +#+ocaml-fmt.18f0c141f17d8bbcdc85882c7bf86bb5fe8273452a3e9111ecc04c538bac0ef8 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:. diff --git a/variants/root-x86_64/ocaml-lun b/variants/root-x86_64/ocaml-lun @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+dune.be5001ce5cb88a87d61044499f7436e14280c54971a91c7553b465498786150e +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+dune.43a061d87064657f66873e171dbe9ceaa78f9ece8829e1f724df01f0acb0c2f5 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:. diff --git a/variants/root-x86_64/ocaml-mtime b/variants/root-x86_64/ocaml-mtime @@ -4,11 +4,11 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+ocaml-findlib.c61f44946368c4e5a662f4acc956745078c5a164fc9f5464b1fbc8fefb7e1a42 -#+ocamlbuild.ec8d0709f4f2feda206ea4c4e2a4e8f937cc8ea5e8744dac5b8981a245dbd87b -#+opam.38f724f22cd2d0cc8b2f406ce402648178122eed4a2c9e24fbd6f0f582f360ca -#+ocaml-topkg.bf0fffcfd6438a7dd604e99da0e4bb1d424451fd080eb4098742b442a8707bf6 +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+ocaml-findlib.9867e07edff9239f9dd1384cdb290a5e2e1f7f5456b6e524cb83596a6dbab610 +#+ocamlbuild.fcbe620de239164f3862ac9d0e6ba7a01f0ab7a2342989e386f842903804e01c +#+opam.8dbd74c033bf6c129ad36a9e7ef988b9019d762fc3280724a933a26c7a59b117 +#+ocaml-topkg.4530fcbaba0f2c8e0abda8a6d8d50dd30fe36719befcea8e2b49be258927bb7f #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:. diff --git a/variants/root-x86_64/ocaml-ppx_derivers b/variants/root-x86_64/ocaml-ppx_derivers @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+dune.be5001ce5cb88a87d61044499f7436e14280c54971a91c7553b465498786150e +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+dune.43a061d87064657f66873e171dbe9ceaa78f9ece8829e1f724df01f0acb0c2f5 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:. diff --git a/variants/root-x86_64/ocaml-ppx_deriving b/variants/root-x86_64/ocaml-ppx_deriving @@ -4,15 +4,15 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+dune.be5001ce5cb88a87d61044499f7436e14280c54971a91c7553b465498786150e -#+ocaml-compiler-libs.26000ecf6713c1cbe01b3654aa84bb703dcd6e225f7f0dee326a5f3c67896074 -#+ocaml-cppo.c98369fb1efda094520567acbed42aef924ae6fd5cd1bae4edb534a79b0d7422 -#+ocaml-findlib.c61f44946368c4e5a662f4acc956745078c5a164fc9f5464b1fbc8fefb7e1a42 -#+ocaml-ppx_derivers.b777e0916489e07228e29d02a65fd509178c8f5027e8cb447395bb9b3e648d6f -#+ocaml-ppxlib.42bc1f00e78b128e3513f5c699d5e96eadbc2d5d04a4cd0c05295bb137f66d97 -#+ocaml-sexplib0.f36727db00e34e237bfd1ff2e1cf6df354113f6f7b1f9611253ad028b58727b6 -#+ocaml-stdlib-shims.b6bd5355c44f98e4e79cd85b06f703a9b14adbd991ec05e2b17fe290b2e979ca +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+dune.43a061d87064657f66873e171dbe9ceaa78f9ece8829e1f724df01f0acb0c2f5 +#+ocaml-compiler-libs.3b2fe8c6386f4a4c0ac2af567fdb7ebb7f5ebfaed8436bb521661ddd50ec2031 +#+ocaml-cppo.15329e067479908a9704db39a39360cb89944e48c5795d76d8f57e48182d48cd +#+ocaml-findlib.9867e07edff9239f9dd1384cdb290a5e2e1f7f5456b6e524cb83596a6dbab610 +#+ocaml-ppx_derivers.b9e5ce371c806304a86499c949c8ff9216ef04d35aa834b3394d3884c2316050 +#+ocaml-ppxlib.3052eb0f3bd899796efca3402f81d7a2efbaafffb17686bd5e046cca4d6d7a6f +#+ocaml-sexplib0.b44e27cd3fe019385b5e410ea35642bcb2e8873fc875a32703ef902b76e96c48 +#+ocaml-stdlib-shims.e356d377615945667cbb5ddca477db85e0cdb64cca3565debc7f9896c26eaafe #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:. diff --git a/variants/root-x86_64/ocaml-ppxlib b/variants/root-x86_64/ocaml-ppxlib @@ -4,12 +4,12 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+dune.be5001ce5cb88a87d61044499f7436e14280c54971a91c7553b465498786150e -#+ocaml-compiler-libs.26000ecf6713c1cbe01b3654aa84bb703dcd6e225f7f0dee326a5f3c67896074 -#+ocaml-ppx_derivers.b777e0916489e07228e29d02a65fd509178c8f5027e8cb447395bb9b3e648d6f -#+ocaml-sexplib0.f36727db00e34e237bfd1ff2e1cf6df354113f6f7b1f9611253ad028b58727b6 -#+ocaml-stdlib-shims.b6bd5355c44f98e4e79cd85b06f703a9b14adbd991ec05e2b17fe290b2e979ca +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+dune.43a061d87064657f66873e171dbe9ceaa78f9ece8829e1f724df01f0acb0c2f5 +#+ocaml-compiler-libs.3b2fe8c6386f4a4c0ac2af567fdb7ebb7f5ebfaed8436bb521661ddd50ec2031 +#+ocaml-ppx_derivers.b9e5ce371c806304a86499c949c8ff9216ef04d35aa834b3394d3884c2316050 +#+ocaml-sexplib0.b44e27cd3fe019385b5e410ea35642bcb2e8873fc875a32703ef902b76e96c48 +#+ocaml-stdlib-shims.e356d377615945667cbb5ddca477db85e0cdb64cca3565debc7f9896c26eaafe #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:. diff --git a/variants/root-x86_64/ocaml-rresult b/variants/root-x86_64/ocaml-rresult @@ -4,11 +4,11 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+ocaml-findlib.c61f44946368c4e5a662f4acc956745078c5a164fc9f5464b1fbc8fefb7e1a42 -#+ocamlbuild.ec8d0709f4f2feda206ea4c4e2a4e8f937cc8ea5e8744dac5b8981a245dbd87b -#+opam.38f724f22cd2d0cc8b2f406ce402648178122eed4a2c9e24fbd6f0f582f360ca -#+ocaml-topkg.bf0fffcfd6438a7dd604e99da0e4bb1d424451fd080eb4098742b442a8707bf6 +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+ocaml-findlib.9867e07edff9239f9dd1384cdb290a5e2e1f7f5456b6e524cb83596a6dbab610 +#+ocamlbuild.fcbe620de239164f3862ac9d0e6ba7a01f0ab7a2342989e386f842903804e01c +#+opam.8dbd74c033bf6c129ad36a9e7ef988b9019d762fc3280724a933a26c7a59b117 +#+ocaml-topkg.4530fcbaba0f2c8e0abda8a6d8d50dd30fe36719befcea8e2b49be258927bb7f #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:. diff --git a/variants/root-x86_64/ocaml-sexplib0 b/variants/root-x86_64/ocaml-sexplib0 @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+dune.be5001ce5cb88a87d61044499f7436e14280c54971a91c7553b465498786150e +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+dune.43a061d87064657f66873e171dbe9ceaa78f9ece8829e1f724df01f0acb0c2f5 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:. diff --git a/variants/root-x86_64/ocaml-stdlib-shims b/variants/root-x86_64/ocaml-stdlib-shims @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+dune.be5001ce5cb88a87d61044499f7436e14280c54971a91c7553b465498786150e +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+dune.43a061d87064657f66873e171dbe9ceaa78f9ece8829e1f724df01f0acb0c2f5 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:. diff --git a/variants/root-x86_64/ocaml-topkg b/variants/root-x86_64/ocaml-topkg @@ -4,10 +4,10 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+ocaml-findlib.c61f44946368c4e5a662f4acc956745078c5a164fc9f5464b1fbc8fefb7e1a42 -#+ocamlbuild.ec8d0709f4f2feda206ea4c4e2a4e8f937cc8ea5e8744dac5b8981a245dbd87b -#+opam.38f724f22cd2d0cc8b2f406ce402648178122eed4a2c9e24fbd6f0f582f360ca +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+ocaml-findlib.9867e07edff9239f9dd1384cdb290a5e2e1f7f5456b6e524cb83596a6dbab610 +#+ocamlbuild.fcbe620de239164f3862ac9d0e6ba7a01f0ab7a2342989e386f842903804e01c +#+opam.8dbd74c033bf6c129ad36a9e7ef988b9019d762fc3280724a933a26c7a59b117 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:. diff --git a/variants/root-x86_64/ocaml:dynlink b/variants/root-x86_64/ocaml:dynlink @@ -58,7 +58,6 @@ make DESTDIR="$pthbs_destdir" install mkdir -p "$dest/.env-template" -printf '%s' >"$dest/.env-template"/'OCAMLPARAM' 'I=@ENVROOT@/library.ocaml,_' printf '%s' >"$dest/.env-template"/'OCAMLPATH' '@ENVROOT@/library.ocaml' cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/ocaml_intrinsics_kernel b/variants/root-x86_64/ocaml_intrinsics_kernel @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+dune.be5001ce5cb88a87d61044499f7436e14280c54971a91c7553b465498786150e +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+dune.43a061d87064657f66873e171dbe9ceaa78f9ece8829e1f724df01f0acb0c2f5 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:. diff --git a/variants/root-x86_64/ocamlbuild b/variants/root-x86_64/ocamlbuild @@ -6,7 +6,7 @@ #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:. @@ -49,6 +49,11 @@ make configure \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) +# workaround ocamlbuild manpage getting installed to stdlib directory +stdlib="$pthbs_destdir/versions/ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964" +mkdir -p "${stdlib%/*}" +ln -s "$pthbs_package" "$stdlib" + make DESTDIR="$pthbs_destdir" install @@ -61,6 +66,7 @@ cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./command/ocamlbuild"]=1 + x["./man/man1/ocamlbuild.1"]=1 } function r1(s) { diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam @@ -7,8 +7,8 @@ #+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #+getconf.0d39c75a75e6b938e367a7c53998e6c38a20cf8bf46407cab3bf765e512e5cfd -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+dune.be5001ce5cb88a87d61044499f7436e14280c54971a91c7553b465498786150e +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+dune.43a061d87064657f66873e171dbe9ceaa78f9ece8829e1f724df01f0acb0c2f5 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:. @@ -47,7 +47,7 @@ export DUNE_CACHE=disabled --infodir="$prefix/info" \ --localedir="$prefix/locale" \ --localstatedir='/var/pthbs' \ - --with-dune='/versions/dune.be5001ce5cb88a87d61044499f7436e14280c54971a91c7553b465498786150e/command/dune' \ + --with-dune='/versions/dune.43a061d87064657f66873e171dbe9ceaa78f9ece8829e1f724df01f0acb0c2f5/command/dune' \ --with-mccs \ --with-vendored-deps \ --enable-static diff --git a/variants/root-x86_64/wip.environment b/variants/root-x86_64/wip.environment @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b -#+dune.be5001ce5cb88a87d61044499f7436e14280c54971a91c7553b465498786150e -#+ocamlbuild.ec8d0709f4f2feda206ea4c4e2a4e8f937cc8ea5e8744dac5b8981a245dbd87b -#+ocaml-base.9dcf474f88ddf0f91bdc540723a7b1448142f444aac29224045dbc55bf778a5b -#+opam.38f724f22cd2d0cc8b2f406ce402648178122eed4a2c9e24fbd6f0f582f360ca -#+ocaml-bos.c137bed3c8e4c715a29f18223c9f5f8ee09aa00d3945cbecfa18c7c9f181ce40 -#+ocaml-lun.901a9abf264f42356df098a120f2d0c832099b0054ab01109a7183eb2feb73e5 -#+ocaml-ppx_deriving.1bd5d72a1588ba11acc2f21b1393e49570bf84a78f7413e0fe795fbff92eaa9c- \ No newline at end of file +#+ocaml.70a0b2b56b377481980e6bc5c5d2f9732392000af40fd88c083c679ce76aa964 +#+dune.43a061d87064657f66873e171dbe9ceaa78f9ece8829e1f724df01f0acb0c2f5 +#+ocamlbuild.fcbe620de239164f3862ac9d0e6ba7a01f0ab7a2342989e386f842903804e01c +#+ocaml-base.fe8300acd5d9184c537bd7d87e19721b9b683d6b7dedd52f56572d0f331ddfa0 +#+opam.8dbd74c033bf6c129ad36a9e7ef988b9019d762fc3280724a933a26c7a59b117 +#+ocaml-bos.41f4c8922be6fc4c87e6a9eb7c2d38aed8ca5fd9874c3e0707d5f68b0c6d40e8 +#+ocaml-lun.7f1fb3d79e2e42258ddc07c0ee12200213ec54b97b19b7ab5320dc47447bc169 +#+ocaml-ppx_deriving.e34499344421574a4d374a07387ee53f5d99d9781b5b07c6da8358f97601d4d8+ \ No newline at end of file