commit 220a37c0e89cfa07e92c50120913ca87a47ec4bb parent 0d2a15a62b266e1439e1db9a6fa85ac9afc28ab8 Author: Jan Pobrislo <ccx@te2000.cz> Date: Wed, 17 Dec 2025 21:46:37 +0000 use variables for potential linker paths Diffstat:
49 files changed, 197 insertions(+), 176 deletions(-)
diff --git a/templates/functions/check_dynamic b/templates/functions/check_dynamic @@ -1,3 +1,5 @@ +linker_path_mcm='{{pkg_install_dir("musl")}}/{{triplet}}/{{dynlibdir}}/ld-musl-{{triplet.split('-')[0]}}.so.1' +linker_path_musl='{{pkg_install_dir("musl")}}/{{triplet}}/{{dynlibdir}}/ld-musl-{{triplet.split('-')[0]}}.so.1' check_dynamic() { local exe || true exe=$pthbs_destdir'{{versions}}'/$pthbs_package/$1 @@ -12,14 +14,15 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'{{pkg_install_dir("musl")}}/{{triplet}}/{{dynlibdir}}/ld-musl-{{triplet.split('-')[0]}}.so.1') + (*"$linker_path_mcm") return 0 ;; - (*'{{pkg_install_dir("musl-cross-make")}}/{{triplet}}/lib/ld-musl-{{triplet.split('-')[0]}}.so.1') + (*"$linker_path_musl") return 0 ;; (*) printf '%s\n' "Error: '$1' unexpected linker path!" + ls -l "$linker_path_mcm" "$linker_path_musl" exit 1 esac } diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune @@ -35,6 +35,8 @@ # - build script start - +linker_path_mcm='/home/ccx/versions/musl.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1' +linker_path_musl='/home/ccx/versions/musl.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1' check_dynamic() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -49,14 +51,15 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/home/ccx/versions/musl.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1') + (*"$linker_path_mcm") return 0 ;; - (*'/home/ccx/versions/musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*"$linker_path_musl") return 0 ;; (*) printf '%s\n' "Error: '$1' unexpected linker path!" + ls -l "$linker_path_mcm" "$linker_path_musl" exit 1 esac } diff --git a/variants/ccx-x86_64/ocaml-astring b/variants/ccx-x86_64/ocaml-astring @@ -30,10 +30,10 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d -#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed -#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c -#+ocaml-topkg.bf6907ff38bdef5a729dfbf68e54f72c3212baa4d7768dae2a1856d605019ebc +#+ocaml-findlib.be143659ba415bee3f40e608840a993a44ddf1b19e54b2cc1ecc49951599d1e0 +#+ocamlbuild.eb656da0f5576348e97d87b765d90f317e783e23b4a61bfd116e58073a9aa240 +#+opam.5128df59f045a372c00e95347b98d8474be5fe04d7b3b899321f32e7834e2a8d +#+ocaml-topkg.7390b2ba5590f22ed1c462297e17165400cd184f14d73ff0ce133b04df425c42 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:. diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base @@ -30,9 +30,9 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c -#+ocaml_intrinsics_kernel.77c07aa0c443fa37d7e73f7a7a95cdd03dc527e418b8f0894acec65da3c81b81 -#+ocaml-sexplib0.91dd8294e2c57cf96407555fb0839a1f6218a186500b861c68996e6eda012dba +#+dune.b9b16863b3f02fce01088f3b63964ded4392100a2806a469d338160f112c0a87 +#+ocaml_intrinsics_kernel.e1fe5883d02e8681765b5d9c8b95b7b0d926b2e8fc15b2d4f96f0764d65238b3 +#+ocaml-sexplib0.4dc52f4d5e284db473dc6214ad2bf4a47d194c9d784d6fc347cb43284b219f9f #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:. diff --git a/variants/ccx-x86_64/ocaml-bos b/variants/ccx-x86_64/ocaml-bos @@ -30,16 +30,16 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d -#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed -#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c -#+ocaml-topkg.bf6907ff38bdef5a729dfbf68e54f72c3212baa4d7768dae2a1856d605019ebc -#+ocaml-astring.659317c08727f660b42fcd0dd5dbfeb50d9a2933459f0bcd8e170c3019edf855 -#+ocaml-fpath.454c610722caac74fc691abe5bc49d02b05cb318670e84a6f60f14003d4918d2 -#+ocaml-rresult.5f58caa1808da1539198ec75e42ac90ca619e9c7a3845a71e9e666b455173723 -#+ocaml-fmt.c5cfbbeea2f77a42e1fa764f7cd42796bd897667c183fdaeb2bbd9f31ab04929 -#+ocaml-logs.f72712b0575042f7f5abeac69b423b9d41b78ca96e889aa46149374b26728faf -#+ocaml-mtime.faa6c0dff5974dd2c4d2f75e480496024316a230bdb6c3ebbf0ee239f0788902 +#+ocaml-findlib.be143659ba415bee3f40e608840a993a44ddf1b19e54b2cc1ecc49951599d1e0 +#+ocamlbuild.eb656da0f5576348e97d87b765d90f317e783e23b4a61bfd116e58073a9aa240 +#+opam.5128df59f045a372c00e95347b98d8474be5fe04d7b3b899321f32e7834e2a8d +#+ocaml-topkg.7390b2ba5590f22ed1c462297e17165400cd184f14d73ff0ce133b04df425c42 +#+ocaml-astring.302b1746702806e268fc97a507835d4c2bccd54e7121a76b67e0ec6dc47b31da +#+ocaml-fpath.16d512d2987971e71a5dfbe0aa5a3ae9ce9869dfe383941dc1f9aa84c6af27ba +#+ocaml-rresult.a3cdac0f13432e73a0434aa47b1903a94590b646c48b4a05e2be90ab117f28b0 +#+ocaml-fmt.3b5e7419f7bd79201cb18354d7e1a2f1f059b24612d60137c93090a326841665 +#+ocaml-logs.ed6cf547f0716377da5248cb3f9f7e7cae24be441441b7c15c635327193403d8 +#+ocaml-mtime.7f3fce186f181550f2f32d2a69b2444d38f7bad2dad01cd5751a3eec31cf8fcb #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:. diff --git a/variants/ccx-x86_64/ocaml-cmdliner b/variants/ccx-x86_64/ocaml-cmdliner @@ -30,10 +30,10 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d -#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed -#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c -#+ocaml-topkg.bf6907ff38bdef5a729dfbf68e54f72c3212baa4d7768dae2a1856d605019ebc +#+ocaml-findlib.be143659ba415bee3f40e608840a993a44ddf1b19e54b2cc1ecc49951599d1e0 +#+ocamlbuild.eb656da0f5576348e97d87b765d90f317e783e23b4a61bfd116e58073a9aa240 +#+opam.5128df59f045a372c00e95347b98d8474be5fe04d7b3b899321f32e7834e2a8d +#+ocaml-topkg.7390b2ba5590f22ed1c462297e17165400cd184f14d73ff0ce133b04df425c42 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:. diff --git a/variants/ccx-x86_64/ocaml-compiler-libs b/variants/ccx-x86_64/ocaml-compiler-libs @@ -30,7 +30,7 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c +#+dune.b9b16863b3f02fce01088f3b63964ded4392100a2806a469d338160f112c0a87 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:. diff --git a/variants/ccx-x86_64/ocaml-cppo b/variants/ccx-x86_64/ocaml-cppo @@ -30,8 +30,8 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c -#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed +#+dune.b9b16863b3f02fce01088f3b63964ded4392100a2806a469d338160f112c0a87 +#+ocamlbuild.eb656da0f5576348e97d87b765d90f317e783e23b4a61bfd116e58073a9aa240 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:. diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib @@ -33,12 +33,14 @@ #+m4.291f5a7d2542242cce6b1948a14ffe3a466805f2eb3ef3ffc413c5a923b9100c #+netbsd-curses.9137bca2b96b754799b50900670f895d68f7fd155a7f779b0b0bd0c3f24f9f66 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed +#+ocamlbuild.eb656da0f5576348e97d87b765d90f317e783e23b4a61bfd116e58073a9aa240 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:. # - build script start - +linker_path_mcm='/home/ccx/versions/musl.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1' +linker_path_musl='/home/ccx/versions/musl.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1' check_dynamic() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -53,14 +55,15 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/home/ccx/versions/musl.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1') + (*"$linker_path_mcm") return 0 ;; - (*'/home/ccx/versions/musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*"$linker_path_musl") return 0 ;; (*) printf '%s\n' "Error: '$1' unexpected linker path!" + ls -l "$linker_path_mcm" "$linker_path_musl" exit 1 esac } diff --git a/variants/ccx-x86_64/ocaml-fmt b/variants/ccx-x86_64/ocaml-fmt @@ -30,11 +30,11 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d -#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed -#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c -#+ocaml-topkg.bf6907ff38bdef5a729dfbf68e54f72c3212baa4d7768dae2a1856d605019ebc -#+ocaml-cmdliner.af98da53de0b1c9565cca2f3bf031a3c50d6a75c2bd9fcbb0f1ccdde5e4ba697 +#+ocaml-findlib.be143659ba415bee3f40e608840a993a44ddf1b19e54b2cc1ecc49951599d1e0 +#+ocamlbuild.eb656da0f5576348e97d87b765d90f317e783e23b4a61bfd116e58073a9aa240 +#+opam.5128df59f045a372c00e95347b98d8474be5fe04d7b3b899321f32e7834e2a8d +#+ocaml-topkg.7390b2ba5590f22ed1c462297e17165400cd184f14d73ff0ce133b04df425c42 +#+ocaml-cmdliner.ad927aabdfa29c63cc1b43d9d8e3fc950d000cc187eeec3ed65e2c1466e4e2f9 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:. diff --git a/variants/ccx-x86_64/ocaml-fpath b/variants/ccx-x86_64/ocaml-fpath @@ -30,11 +30,11 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d -#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed -#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c -#+ocaml-topkg.bf6907ff38bdef5a729dfbf68e54f72c3212baa4d7768dae2a1856d605019ebc -#+ocaml-astring.659317c08727f660b42fcd0dd5dbfeb50d9a2933459f0bcd8e170c3019edf855 +#+ocaml-findlib.be143659ba415bee3f40e608840a993a44ddf1b19e54b2cc1ecc49951599d1e0 +#+ocamlbuild.eb656da0f5576348e97d87b765d90f317e783e23b4a61bfd116e58073a9aa240 +#+opam.5128df59f045a372c00e95347b98d8474be5fe04d7b3b899321f32e7834e2a8d +#+ocaml-topkg.7390b2ba5590f22ed1c462297e17165400cd184f14d73ff0ce133b04df425c42 +#+ocaml-astring.302b1746702806e268fc97a507835d4c2bccd54e7121a76b67e0ec6dc47b31da #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:. diff --git a/variants/ccx-x86_64/ocaml-logs b/variants/ccx-x86_64/ocaml-logs @@ -30,13 +30,13 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d -#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed -#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c -#+ocaml-topkg.bf6907ff38bdef5a729dfbf68e54f72c3212baa4d7768dae2a1856d605019ebc -#+ocaml-mtime.faa6c0dff5974dd2c4d2f75e480496024316a230bdb6c3ebbf0ee239f0788902 -#+ocaml-cmdliner.af98da53de0b1c9565cca2f3bf031a3c50d6a75c2bd9fcbb0f1ccdde5e4ba697 -#+ocaml-fmt.c5cfbbeea2f77a42e1fa764f7cd42796bd897667c183fdaeb2bbd9f31ab04929 +#+ocaml-findlib.be143659ba415bee3f40e608840a993a44ddf1b19e54b2cc1ecc49951599d1e0 +#+ocamlbuild.eb656da0f5576348e97d87b765d90f317e783e23b4a61bfd116e58073a9aa240 +#+opam.5128df59f045a372c00e95347b98d8474be5fe04d7b3b899321f32e7834e2a8d +#+ocaml-topkg.7390b2ba5590f22ed1c462297e17165400cd184f14d73ff0ce133b04df425c42 +#+ocaml-mtime.7f3fce186f181550f2f32d2a69b2444d38f7bad2dad01cd5751a3eec31cf8fcb +#+ocaml-cmdliner.ad927aabdfa29c63cc1b43d9d8e3fc950d000cc187eeec3ed65e2c1466e4e2f9 +#+ocaml-fmt.3b5e7419f7bd79201cb18354d7e1a2f1f059b24612d60137c93090a326841665 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:. diff --git a/variants/ccx-x86_64/ocaml-lun b/variants/ccx-x86_64/ocaml-lun @@ -30,7 +30,7 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c +#+dune.b9b16863b3f02fce01088f3b63964ded4392100a2806a469d338160f112c0a87 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:. diff --git a/variants/ccx-x86_64/ocaml-mtime b/variants/ccx-x86_64/ocaml-mtime @@ -30,10 +30,10 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d -#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed -#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c -#+ocaml-topkg.bf6907ff38bdef5a729dfbf68e54f72c3212baa4d7768dae2a1856d605019ebc +#+ocaml-findlib.be143659ba415bee3f40e608840a993a44ddf1b19e54b2cc1ecc49951599d1e0 +#+ocamlbuild.eb656da0f5576348e97d87b765d90f317e783e23b4a61bfd116e58073a9aa240 +#+opam.5128df59f045a372c00e95347b98d8474be5fe04d7b3b899321f32e7834e2a8d +#+ocaml-topkg.7390b2ba5590f22ed1c462297e17165400cd184f14d73ff0ce133b04df425c42 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:. diff --git a/variants/ccx-x86_64/ocaml-ppx_derivers b/variants/ccx-x86_64/ocaml-ppx_derivers @@ -30,7 +30,7 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c +#+dune.b9b16863b3f02fce01088f3b63964ded4392100a2806a469d338160f112c0a87 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:. diff --git a/variants/ccx-x86_64/ocaml-ppx_deriving b/variants/ccx-x86_64/ocaml-ppx_deriving @@ -30,14 +30,14 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c -#+ocaml-compiler-libs.dd2d8cf2491056df70bc9ed114e61d856c612f6dac2cf5e1b62409a8cad41099 -#+ocaml-cppo.e9f0b20374c85278e8ecf2d3a7de95ad0ec469482a7a8177ee0ed8173b219176 -#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d -#+ocaml-ppx_derivers.173a5a02a5493bdab99a38fd4f8d55ed7a6ccb077bda0b9736ce5929e65c65e0 -#+ocaml-ppxlib.76a8f9c86afa3b8bdf61e2e694575ec5d9f62728f1bdd5cb5f9ba564728ccd90 -#+ocaml-sexplib0.91dd8294e2c57cf96407555fb0839a1f6218a186500b861c68996e6eda012dba -#+ocaml-stdlib-shims.3a5f5104012c92583bfb802d8313a7ee4eacd1b772df0f9d423a52cbc0025001 +#+dune.b9b16863b3f02fce01088f3b63964ded4392100a2806a469d338160f112c0a87 +#+ocaml-compiler-libs.74b0894a1415e4789df9b90d7eca0013666f6c7b0e228c03fb92ad69f16f0d94 +#+ocaml-cppo.35afe8bbdc8e97a4582c58b426bf06b57fc6d52c6dc6009d88cf5d99b824d803 +#+ocaml-findlib.be143659ba415bee3f40e608840a993a44ddf1b19e54b2cc1ecc49951599d1e0 +#+ocaml-ppx_derivers.e202ab2ed1edb5809f0fdcbe19ecc6520f8c901c8497d8a03ea559c76ef45eea +#+ocaml-ppxlib.3f114545e63ab15f2f6707a2675941ed4f13f9a5f24381e675bbc83f5b61d518 +#+ocaml-sexplib0.4dc52f4d5e284db473dc6214ad2bf4a47d194c9d784d6fc347cb43284b219f9f +#+ocaml-stdlib-shims.8691fb07864102b3f113beebd49facc0383c16b5afef6e28694548a51acdb13c #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:. diff --git a/variants/ccx-x86_64/ocaml-ppxlib b/variants/ccx-x86_64/ocaml-ppxlib @@ -30,11 +30,11 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c -#+ocaml-compiler-libs.dd2d8cf2491056df70bc9ed114e61d856c612f6dac2cf5e1b62409a8cad41099 -#+ocaml-ppx_derivers.173a5a02a5493bdab99a38fd4f8d55ed7a6ccb077bda0b9736ce5929e65c65e0 -#+ocaml-sexplib0.91dd8294e2c57cf96407555fb0839a1f6218a186500b861c68996e6eda012dba -#+ocaml-stdlib-shims.3a5f5104012c92583bfb802d8313a7ee4eacd1b772df0f9d423a52cbc0025001 +#+dune.b9b16863b3f02fce01088f3b63964ded4392100a2806a469d338160f112c0a87 +#+ocaml-compiler-libs.74b0894a1415e4789df9b90d7eca0013666f6c7b0e228c03fb92ad69f16f0d94 +#+ocaml-ppx_derivers.e202ab2ed1edb5809f0fdcbe19ecc6520f8c901c8497d8a03ea559c76ef45eea +#+ocaml-sexplib0.4dc52f4d5e284db473dc6214ad2bf4a47d194c9d784d6fc347cb43284b219f9f +#+ocaml-stdlib-shims.8691fb07864102b3f113beebd49facc0383c16b5afef6e28694548a51acdb13c #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:. diff --git a/variants/ccx-x86_64/ocaml-rresult b/variants/ccx-x86_64/ocaml-rresult @@ -30,10 +30,10 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d -#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed -#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c -#+ocaml-topkg.bf6907ff38bdef5a729dfbf68e54f72c3212baa4d7768dae2a1856d605019ebc +#+ocaml-findlib.be143659ba415bee3f40e608840a993a44ddf1b19e54b2cc1ecc49951599d1e0 +#+ocamlbuild.eb656da0f5576348e97d87b765d90f317e783e23b4a61bfd116e58073a9aa240 +#+opam.5128df59f045a372c00e95347b98d8474be5fe04d7b3b899321f32e7834e2a8d +#+ocaml-topkg.7390b2ba5590f22ed1c462297e17165400cd184f14d73ff0ce133b04df425c42 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:. diff --git a/variants/ccx-x86_64/ocaml-sexplib0 b/variants/ccx-x86_64/ocaml-sexplib0 @@ -30,7 +30,7 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c +#+dune.b9b16863b3f02fce01088f3b63964ded4392100a2806a469d338160f112c0a87 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:. diff --git a/variants/ccx-x86_64/ocaml-stdlib-shims b/variants/ccx-x86_64/ocaml-stdlib-shims @@ -30,7 +30,7 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c +#+dune.b9b16863b3f02fce01088f3b63964ded4392100a2806a469d338160f112c0a87 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:. diff --git a/variants/ccx-x86_64/ocaml-topkg b/variants/ccx-x86_64/ocaml-topkg @@ -30,9 +30,9 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d -#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed -#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c +#+ocaml-findlib.be143659ba415bee3f40e608840a993a44ddf1b19e54b2cc1ecc49951599d1e0 +#+ocamlbuild.eb656da0f5576348e97d87b765d90f317e783e23b4a61bfd116e58073a9aa240 +#+opam.5128df59f045a372c00e95347b98d8474be5fe04d7b3b899321f32e7834e2a8d #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:. diff --git a/variants/ccx-x86_64/ocaml.environment b/variants/ccx-x86_64/ocaml.environment @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c -#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed -#+ocaml-base.60666f3c502b251e4d95f169e3d1a9bc32df330db5ccc21a21dae5b467f0ce74 -#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c -#+ocaml-bos.518ccc802e50a439431e9707129c105e10bbcf585229a6e520e364ca892447c6 -#+ocaml-lun.f29c94524864977e95f77aebc861d5a33da37de13f0efb5756fa47ca4e7ad60d -#+ocaml-ppx_deriving.0b985931491e7443a3925d4a50e2a81c88dd517367b4f7e6f0590c7b7419ae9f- \ No newline at end of file +#+dune.b9b16863b3f02fce01088f3b63964ded4392100a2806a469d338160f112c0a87 +#+ocamlbuild.eb656da0f5576348e97d87b765d90f317e783e23b4a61bfd116e58073a9aa240 +#+ocaml-base.fdd9058046c137d19a9df12b3308baf1677e242f52dcb7b673c5e47b3ac4aee4 +#+opam.5128df59f045a372c00e95347b98d8474be5fe04d7b3b899321f32e7834e2a8d +#+ocaml-bos.8aebaf17269048dd2d03d316929b44056aeddf8cd425b466c6c1c505132cacf9 +#+ocaml-lun.a76ecebf752d9f21e1d3ee7e57417c6b61af58f858bf98a5bddb48328044e283 +#+ocaml-ppx_deriving.06ae4d797cf7f25eb26e046da8b60933593b5facf882bc0612f5765caefc8883+ \ No newline at end of file diff --git a/variants/ccx-x86_64/ocaml_intrinsics_kernel b/variants/ccx-x86_64/ocaml_intrinsics_kernel @@ -30,7 +30,7 @@ #+busybox-diffutils.0b706b877e9775b77e5d984dc15aca3292974fb597142ce5ee78cf88d4e93863 #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c +#+dune.b9b16863b3f02fce01088f3b63964ded4392100a2806a469d338160f112c0a87 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:. diff --git a/variants/ccx-x86_64/ocamlbuild b/variants/ccx-x86_64/ocamlbuild @@ -37,6 +37,8 @@ # - build script start - +linker_path_mcm='/home/ccx/versions/musl.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1' +linker_path_musl='/home/ccx/versions/musl.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1' check_dynamic() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -51,14 +53,15 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/home/ccx/versions/musl.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1') + (*"$linker_path_mcm") return 0 ;; - (*'/home/ccx/versions/musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*"$linker_path_musl") return 0 ;; (*) printf '%s\n' "Error: '$1' unexpected linker path!" + ls -l "$linker_path_mcm" "$linker_path_musl" exit 1 esac } diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam @@ -33,7 +33,7 @@ #+musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08 #+getconf.a6a9005469c1af89951955ff38d95087921263e684686215062c291d692330ea #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c +#+dune.b9b16863b3f02fce01088f3b63964ded4392100a2806a469d338160f112c0a87 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:. @@ -72,7 +72,7 @@ export DUNE_CACHE=disabled --infodir="$prefix/info" \ --localedir="$prefix/locale" \ --localstatedir='/var/pthbs' \ - --with-dune='/home/ccx/versions/dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c/command/dune' \ + --with-dune='/home/ccx/versions/dune.b9b16863b3f02fce01088f3b63964ded4392100a2806a469d338160f112c0a87/command/dune' \ --with-mccs \ --with-vendored-deps \ --enable-static diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune @@ -35,6 +35,8 @@ # - build script start - +linker_path_mcm='/versions/musl.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1' +linker_path_musl='/versions/musl.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1' check_dynamic() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -49,14 +51,15 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/versions/musl.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1') + (*"$linker_path_mcm") return 0 ;; - (*'/versions/musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*"$linker_path_musl") return 0 ;; (*) printf '%s\n' "Error: '$1' unexpected linker path!" + ls -l "$linker_path_mcm" "$linker_path_musl" exit 1 esac } diff --git a/variants/root-x86_64/ocaml-astring b/variants/root-x86_64/ocaml-astring @@ -30,10 +30,10 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f -#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 -#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be -#+ocaml-topkg.6b200d65fb4c48763d16cd6255f1f8d3b7e932dccfca8abd79040d3e2428758b +#+ocaml-findlib.1e6059820e5e52f87d37bc3eb984f9e02ea9d02f4f80a0d4a58c9aa1846f8356 +#+ocamlbuild.f267b73614c3d1bdc8de62784cda6abc13667fc803db1e48ca72f4b0368cbf9b +#+opam.f7f09dab7ff64cac817d114ef81d73ce106b8ab47a7d320e0ea5046a820a1592 +#+ocaml-topkg.6c8b999d6e5631a4825a5b6be0446aea6306c52424b711b213f27b09fe28fdba #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:. diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base @@ -30,9 +30,9 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe -#+ocaml_intrinsics_kernel.82c3dc887d1238fdb485d58426525d24ff787f7a7b765e6d417e0fc23caf1065 -#+ocaml-sexplib0.c34138f969d8c6467946dda4095fcfc27440d4b2f2a2dd98564cca27e8930d61 +#+dune.98fa92093295483213391255bbdb87741ef97588bb898913dfc9764e9260690d +#+ocaml_intrinsics_kernel.120cf1ebd8d03363d825ca00c7614e98c7016d467d870baaa11c9f1ef6646d9b +#+ocaml-sexplib0.1fa3465ba0e12bf612a847894b999f128bb0162f25de806dc2de9ccc727d1722 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:. diff --git a/variants/root-x86_64/ocaml-bos b/variants/root-x86_64/ocaml-bos @@ -30,16 +30,16 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f -#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 -#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be -#+ocaml-topkg.6b200d65fb4c48763d16cd6255f1f8d3b7e932dccfca8abd79040d3e2428758b -#+ocaml-astring.acc937d32d4c3438085159ca85b7faa45f786bc8e31d154372bde0e927a8a1e0 -#+ocaml-fpath.3a6eda4d4fe6e6ada35423334ab8a6b0c5e5617db027370f44f0a6352b23a569 -#+ocaml-rresult.f91966bd733cca04d4e4d2740ecca53243618d01f3887a4b75cc1d969913939c -#+ocaml-fmt.41f67e68e6e8703c30a68376177ffe4bd84487f5e3dccc8e81b36c9c2d07bd59 -#+ocaml-logs.cbdde47f8fa2e3bb87ba02ae3e22b51bc842f0286dbd3c441feac8d349d24681 -#+ocaml-mtime.b2375792ebe0ee5f61548837756a2d1ff334fe4bbd2443f7ebff789a9624ca9d +#+ocaml-findlib.1e6059820e5e52f87d37bc3eb984f9e02ea9d02f4f80a0d4a58c9aa1846f8356 +#+ocamlbuild.f267b73614c3d1bdc8de62784cda6abc13667fc803db1e48ca72f4b0368cbf9b +#+opam.f7f09dab7ff64cac817d114ef81d73ce106b8ab47a7d320e0ea5046a820a1592 +#+ocaml-topkg.6c8b999d6e5631a4825a5b6be0446aea6306c52424b711b213f27b09fe28fdba +#+ocaml-astring.daa353890aaef6cca3e21d0f642623c2d60cfee20bec6616993c431844dd174c +#+ocaml-fpath.2387f5d7dcbf5bdc5ec125b6260a32434924b6637ae64a206bca2b24518a8688 +#+ocaml-rresult.dbb7b84f58081f5d830574c7801c182e456ef4ae1494a9640c9dce47a9219026 +#+ocaml-fmt.013c4c5270c0fed01314df4975b9d8e178c48e0635cc3d3094976bbd33fa8aa7 +#+ocaml-logs.06816099dcd531bf469b2799a38c23e2bcaca2e8b46d4690323144f02cd89dc9 +#+ocaml-mtime.6e8af2951c85c4cd2cc6b0d8187e179ebc5653473d53ac615022a54e06991777 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:. diff --git a/variants/root-x86_64/ocaml-cmdliner b/variants/root-x86_64/ocaml-cmdliner @@ -30,10 +30,10 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f -#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 -#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be -#+ocaml-topkg.6b200d65fb4c48763d16cd6255f1f8d3b7e932dccfca8abd79040d3e2428758b +#+ocaml-findlib.1e6059820e5e52f87d37bc3eb984f9e02ea9d02f4f80a0d4a58c9aa1846f8356 +#+ocamlbuild.f267b73614c3d1bdc8de62784cda6abc13667fc803db1e48ca72f4b0368cbf9b +#+opam.f7f09dab7ff64cac817d114ef81d73ce106b8ab47a7d320e0ea5046a820a1592 +#+ocaml-topkg.6c8b999d6e5631a4825a5b6be0446aea6306c52424b711b213f27b09fe28fdba #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:. diff --git a/variants/root-x86_64/ocaml-compiler-libs b/variants/root-x86_64/ocaml-compiler-libs @@ -30,7 +30,7 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe +#+dune.98fa92093295483213391255bbdb87741ef97588bb898913dfc9764e9260690d #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:. diff --git a/variants/root-x86_64/ocaml-cppo b/variants/root-x86_64/ocaml-cppo @@ -30,8 +30,8 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe -#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 +#+dune.98fa92093295483213391255bbdb87741ef97588bb898913dfc9764e9260690d +#+ocamlbuild.f267b73614c3d1bdc8de62784cda6abc13667fc803db1e48ca72f4b0368cbf9b #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:. diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib @@ -33,12 +33,14 @@ #+m4.f098c061d7888597e3affb1019ea369131e6513d63f1bc5e6f43d8d0ac781594 #+netbsd-curses.88f43167ed43bf3f8bbdf74484cd9ba364152ac6b853e6f821bc5aae2e0621c4 #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 +#+ocamlbuild.f267b73614c3d1bdc8de62784cda6abc13667fc803db1e48ca72f4b0368cbf9b #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:. # - build script start - +linker_path_mcm='/versions/musl.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1' +linker_path_musl='/versions/musl.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1' check_dynamic() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -53,14 +55,15 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/versions/musl.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1') + (*"$linker_path_mcm") return 0 ;; - (*'/versions/musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*"$linker_path_musl") return 0 ;; (*) printf '%s\n' "Error: '$1' unexpected linker path!" + ls -l "$linker_path_mcm" "$linker_path_musl" exit 1 esac } diff --git a/variants/root-x86_64/ocaml-fmt b/variants/root-x86_64/ocaml-fmt @@ -30,11 +30,11 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f -#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 -#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be -#+ocaml-topkg.6b200d65fb4c48763d16cd6255f1f8d3b7e932dccfca8abd79040d3e2428758b -#+ocaml-cmdliner.0d775e59b06c6f9f8738ec43d6f5184e34254ceebce4943f5aed2d3724506a30 +#+ocaml-findlib.1e6059820e5e52f87d37bc3eb984f9e02ea9d02f4f80a0d4a58c9aa1846f8356 +#+ocamlbuild.f267b73614c3d1bdc8de62784cda6abc13667fc803db1e48ca72f4b0368cbf9b +#+opam.f7f09dab7ff64cac817d114ef81d73ce106b8ab47a7d320e0ea5046a820a1592 +#+ocaml-topkg.6c8b999d6e5631a4825a5b6be0446aea6306c52424b711b213f27b09fe28fdba +#+ocaml-cmdliner.f61c8e02760be2bbcf195a823b41774966571964079469b05a3ebf0c43c69a27 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:. diff --git a/variants/root-x86_64/ocaml-fpath b/variants/root-x86_64/ocaml-fpath @@ -30,11 +30,11 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f -#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 -#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be -#+ocaml-topkg.6b200d65fb4c48763d16cd6255f1f8d3b7e932dccfca8abd79040d3e2428758b -#+ocaml-astring.acc937d32d4c3438085159ca85b7faa45f786bc8e31d154372bde0e927a8a1e0 +#+ocaml-findlib.1e6059820e5e52f87d37bc3eb984f9e02ea9d02f4f80a0d4a58c9aa1846f8356 +#+ocamlbuild.f267b73614c3d1bdc8de62784cda6abc13667fc803db1e48ca72f4b0368cbf9b +#+opam.f7f09dab7ff64cac817d114ef81d73ce106b8ab47a7d320e0ea5046a820a1592 +#+ocaml-topkg.6c8b999d6e5631a4825a5b6be0446aea6306c52424b711b213f27b09fe28fdba +#+ocaml-astring.daa353890aaef6cca3e21d0f642623c2d60cfee20bec6616993c431844dd174c #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:. diff --git a/variants/root-x86_64/ocaml-logs b/variants/root-x86_64/ocaml-logs @@ -30,13 +30,13 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f -#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 -#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be -#+ocaml-topkg.6b200d65fb4c48763d16cd6255f1f8d3b7e932dccfca8abd79040d3e2428758b -#+ocaml-mtime.b2375792ebe0ee5f61548837756a2d1ff334fe4bbd2443f7ebff789a9624ca9d -#+ocaml-cmdliner.0d775e59b06c6f9f8738ec43d6f5184e34254ceebce4943f5aed2d3724506a30 -#+ocaml-fmt.41f67e68e6e8703c30a68376177ffe4bd84487f5e3dccc8e81b36c9c2d07bd59 +#+ocaml-findlib.1e6059820e5e52f87d37bc3eb984f9e02ea9d02f4f80a0d4a58c9aa1846f8356 +#+ocamlbuild.f267b73614c3d1bdc8de62784cda6abc13667fc803db1e48ca72f4b0368cbf9b +#+opam.f7f09dab7ff64cac817d114ef81d73ce106b8ab47a7d320e0ea5046a820a1592 +#+ocaml-topkg.6c8b999d6e5631a4825a5b6be0446aea6306c52424b711b213f27b09fe28fdba +#+ocaml-mtime.6e8af2951c85c4cd2cc6b0d8187e179ebc5653473d53ac615022a54e06991777 +#+ocaml-cmdliner.f61c8e02760be2bbcf195a823b41774966571964079469b05a3ebf0c43c69a27 +#+ocaml-fmt.013c4c5270c0fed01314df4975b9d8e178c48e0635cc3d3094976bbd33fa8aa7 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:. diff --git a/variants/root-x86_64/ocaml-lun b/variants/root-x86_64/ocaml-lun @@ -30,7 +30,7 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe +#+dune.98fa92093295483213391255bbdb87741ef97588bb898913dfc9764e9260690d #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:. diff --git a/variants/root-x86_64/ocaml-mtime b/variants/root-x86_64/ocaml-mtime @@ -30,10 +30,10 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f -#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 -#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be -#+ocaml-topkg.6b200d65fb4c48763d16cd6255f1f8d3b7e932dccfca8abd79040d3e2428758b +#+ocaml-findlib.1e6059820e5e52f87d37bc3eb984f9e02ea9d02f4f80a0d4a58c9aa1846f8356 +#+ocamlbuild.f267b73614c3d1bdc8de62784cda6abc13667fc803db1e48ca72f4b0368cbf9b +#+opam.f7f09dab7ff64cac817d114ef81d73ce106b8ab47a7d320e0ea5046a820a1592 +#+ocaml-topkg.6c8b999d6e5631a4825a5b6be0446aea6306c52424b711b213f27b09fe28fdba #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:. diff --git a/variants/root-x86_64/ocaml-ppx_derivers b/variants/root-x86_64/ocaml-ppx_derivers @@ -30,7 +30,7 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe +#+dune.98fa92093295483213391255bbdb87741ef97588bb898913dfc9764e9260690d #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:. diff --git a/variants/root-x86_64/ocaml-ppx_deriving b/variants/root-x86_64/ocaml-ppx_deriving @@ -30,14 +30,14 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe -#+ocaml-compiler-libs.504742f149321ddaaf13e3ce60d633d137b3144430eb47795d10033f43e4fa72 -#+ocaml-cppo.9a170e2439960cdbfd9f1e6d7c5183860fa4de80b9e12f71aa9c520e898eca58 -#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f -#+ocaml-ppx_derivers.d08c41e581b011381e58a6337f1c3b490676a37a7b370baf71a1c2d1a853762a -#+ocaml-ppxlib.360df37881d3c98d3a57e6c9490659decb3806356f0207f7554faf5b7d2bcf45 -#+ocaml-sexplib0.c34138f969d8c6467946dda4095fcfc27440d4b2f2a2dd98564cca27e8930d61 -#+ocaml-stdlib-shims.8069b05ecdfbae84e80e00aa3a78520c8c86a6c865dcb002a2a97067c7291f9b +#+dune.98fa92093295483213391255bbdb87741ef97588bb898913dfc9764e9260690d +#+ocaml-compiler-libs.7ac2c7866f365d42ce6a53d9701220884ca2cc22d154f8345f9f1374c17991f1 +#+ocaml-cppo.8ae06652469493a6b46a2bbc5f0d9dd5c88b476d9e06bb01cce30420a5b1f152 +#+ocaml-findlib.1e6059820e5e52f87d37bc3eb984f9e02ea9d02f4f80a0d4a58c9aa1846f8356 +#+ocaml-ppx_derivers.a1b942841641d5bdccd0e9f7e111e268e2abfbf7fbf36442bbb81c90474338fe +#+ocaml-ppxlib.51ad2faa3b85378a4b74dc150ddc470e67142d9abd82b729d3c6221d116f3586 +#+ocaml-sexplib0.1fa3465ba0e12bf612a847894b999f128bb0162f25de806dc2de9ccc727d1722 +#+ocaml-stdlib-shims.55a35e8e567d41d620f0bb37d1be43e8d2be604de14ea7f23e6f9203a7730fc7 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:. diff --git a/variants/root-x86_64/ocaml-ppxlib b/variants/root-x86_64/ocaml-ppxlib @@ -30,11 +30,11 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe -#+ocaml-compiler-libs.504742f149321ddaaf13e3ce60d633d137b3144430eb47795d10033f43e4fa72 -#+ocaml-ppx_derivers.d08c41e581b011381e58a6337f1c3b490676a37a7b370baf71a1c2d1a853762a -#+ocaml-sexplib0.c34138f969d8c6467946dda4095fcfc27440d4b2f2a2dd98564cca27e8930d61 -#+ocaml-stdlib-shims.8069b05ecdfbae84e80e00aa3a78520c8c86a6c865dcb002a2a97067c7291f9b +#+dune.98fa92093295483213391255bbdb87741ef97588bb898913dfc9764e9260690d +#+ocaml-compiler-libs.7ac2c7866f365d42ce6a53d9701220884ca2cc22d154f8345f9f1374c17991f1 +#+ocaml-ppx_derivers.a1b942841641d5bdccd0e9f7e111e268e2abfbf7fbf36442bbb81c90474338fe +#+ocaml-sexplib0.1fa3465ba0e12bf612a847894b999f128bb0162f25de806dc2de9ccc727d1722 +#+ocaml-stdlib-shims.55a35e8e567d41d620f0bb37d1be43e8d2be604de14ea7f23e6f9203a7730fc7 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:. diff --git a/variants/root-x86_64/ocaml-rresult b/variants/root-x86_64/ocaml-rresult @@ -30,10 +30,10 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f -#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 -#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be -#+ocaml-topkg.6b200d65fb4c48763d16cd6255f1f8d3b7e932dccfca8abd79040d3e2428758b +#+ocaml-findlib.1e6059820e5e52f87d37bc3eb984f9e02ea9d02f4f80a0d4a58c9aa1846f8356 +#+ocamlbuild.f267b73614c3d1bdc8de62784cda6abc13667fc803db1e48ca72f4b0368cbf9b +#+opam.f7f09dab7ff64cac817d114ef81d73ce106b8ab47a7d320e0ea5046a820a1592 +#+ocaml-topkg.6c8b999d6e5631a4825a5b6be0446aea6306c52424b711b213f27b09fe28fdba #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:. diff --git a/variants/root-x86_64/ocaml-sexplib0 b/variants/root-x86_64/ocaml-sexplib0 @@ -30,7 +30,7 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe +#+dune.98fa92093295483213391255bbdb87741ef97588bb898913dfc9764e9260690d #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:. diff --git a/variants/root-x86_64/ocaml-stdlib-shims b/variants/root-x86_64/ocaml-stdlib-shims @@ -30,7 +30,7 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe +#+dune.98fa92093295483213391255bbdb87741ef97588bb898913dfc9764e9260690d #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:. diff --git a/variants/root-x86_64/ocaml-topkg b/variants/root-x86_64/ocaml-topkg @@ -30,9 +30,9 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f -#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 -#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be +#+ocaml-findlib.1e6059820e5e52f87d37bc3eb984f9e02ea9d02f4f80a0d4a58c9aa1846f8356 +#+ocamlbuild.f267b73614c3d1bdc8de62784cda6abc13667fc803db1e48ca72f4b0368cbf9b +#+opam.f7f09dab7ff64cac817d114ef81d73ce106b8ab47a7d320e0ea5046a820a1592 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:. diff --git a/variants/root-x86_64/ocaml.environment b/variants/root-x86_64/ocaml.environment @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe -#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 -#+ocaml-base.97fcae28b76c6338132ace31d2d068a91d832aa94fa565fff1de25675e50b3ff -#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be -#+ocaml-bos.a39b09e229cb526176d1067e8292a5318426271c71cece71e9de064664512e7a -#+ocaml-lun.164fd37d06e4a6f2806fc9a56a7b037a9278093e72b435831049107e763f518d -#+ocaml-ppx_deriving.b6997774ea338d2cc6043a7e65c420d1c9507a2294b396455dd45e65a4af3d47- \ No newline at end of file +#+dune.98fa92093295483213391255bbdb87741ef97588bb898913dfc9764e9260690d +#+ocamlbuild.f267b73614c3d1bdc8de62784cda6abc13667fc803db1e48ca72f4b0368cbf9b +#+ocaml-base.8eb1d7ed96562780ca83af661d5fe1f56c54d35cb91aed000ec3e3d630db1614 +#+opam.f7f09dab7ff64cac817d114ef81d73ce106b8ab47a7d320e0ea5046a820a1592 +#+ocaml-bos.e643b5a5a1019dc93eb5297c6cda7c8e656909ee5744ac76b51477bcd8c0561c +#+ocaml-lun.ae9ef6a76386588cdbaad0f46e69bb4ba5f3891401348786e14e725ae43e407d +#+ocaml-ppx_deriving.dcd0b3c2b347b1f4b234e2f9f8ba2f8b7b986ff90f3a9d48cc41d8cf128afd20+ \ No newline at end of file diff --git a/variants/root-x86_64/ocaml_intrinsics_kernel b/variants/root-x86_64/ocaml_intrinsics_kernel @@ -30,7 +30,7 @@ #+busybox-diffutils.859f1c8855b3dc370254b86f4d2d8bffcbafe564d8521738de2a8a78fa95bcd0 #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe +#+dune.98fa92093295483213391255bbdb87741ef97588bb898913dfc9764e9260690d #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:. diff --git a/variants/root-x86_64/ocamlbuild b/variants/root-x86_64/ocamlbuild @@ -37,6 +37,8 @@ # - build script start - +linker_path_mcm='/versions/musl.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1' +linker_path_musl='/versions/musl.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1' check_dynamic() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -51,14 +53,15 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/versions/musl.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1') + (*"$linker_path_mcm") return 0 ;; - (*'/versions/musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*"$linker_path_musl") return 0 ;; (*) printf '%s\n' "Error: '$1' unexpected linker path!" + ls -l "$linker_path_mcm" "$linker_path_musl" exit 1 esac } diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam @@ -33,7 +33,7 @@ #+musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd #+getconf.23bda76e86acf24059fb66464835f69b01ff887cf95579e43090fa3e0e942426 #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe +#+dune.98fa92093295483213391255bbdb87741ef97588bb898913dfc9764e9260690d #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:. @@ -72,7 +72,7 @@ export DUNE_CACHE=disabled --infodir="$prefix/info" \ --localedir="$prefix/locale" \ --localstatedir='/var/pthbs' \ - --with-dune='/versions/dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe/command/dune' \ + --with-dune='/versions/dune.98fa92093295483213391255bbdb87741ef97588bb898913dfc9764e9260690d/command/dune' \ --with-mccs \ --with-vendored-deps \ --enable-static