commit 0d2a15a62b266e1439e1db9a6fa85ac9afc28ab8 parent 6e66704a00949faabf889dc1f4b3575bcff912ff Author: Jan Pobrislo <ccx@te2000.cz> Date: Wed, 17 Dec 2025 15:57:19 +0000 allow linker both from mcm and musl packages Diffstat:
49 files changed, 190 insertions(+), 169 deletions(-)
diff --git a/templates/functions/check_dynamic b/templates/functions/check_dynamic @@ -12,7 +12,10 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'{{pkg_install_dir("musl")}}/{{triplet}}/lib/ld-musl-{{triplet.split('-')[0]}}.so.1') + (*'{{pkg_install_dir("musl")}}/{{triplet}}/{{dynlibdir}}/ld-musl-{{triplet.split('-')[0]}}.so.1') + return 0 + ;; + (*'{{pkg_install_dir("musl-cross-make")}}/{{triplet}}/lib/ld-musl-{{triplet.split('-')[0]}}.so.1') return 0 ;; (*) diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune @@ -49,7 +49,10 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/home/ccx/versions/musl.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*'/home/ccx/versions/musl.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1') + return 0 + ;; + (*'/home/ccx/versions/musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') return 0 ;; (*) 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.f3d61e35fff2b9cc977ec6de82618fb1eaf80844e2ac5c4f3ec09b5030530870 -#+ocamlbuild.bc35da2d78e8bc833627c7be860e0db6a47e007b9aa4cb34ae6c020dd96acd13 -#+opam.a023002202499e077521760a07f4d51a55fe8aec320b139b75c741f67358738a -#+ocaml-topkg.571bc624ebe98daebb588300de003c593f5360130e95d41ad176de57e5fd1898 +#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d +#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed +#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c +#+ocaml-topkg.bf6907ff38bdef5a729dfbf68e54f72c3212baa4d7768dae2a1856d605019ebc #@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.b31decb75af752b3d16cfbde6cea6a5e3583c7e93305f70825232548d7c1f658 -#+ocaml_intrinsics_kernel.99b92a413aae40b6de536928120f324abde8f3b4856202d32df2ad8c4108099c -#+ocaml-sexplib0.371a49e39248f172addb97567b1544a93041c2af3f0631cd94ad6d3fed88d8d7 +#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c +#+ocaml_intrinsics_kernel.77c07aa0c443fa37d7e73f7a7a95cdd03dc527e418b8f0894acec65da3c81b81 +#+ocaml-sexplib0.91dd8294e2c57cf96407555fb0839a1f6218a186500b861c68996e6eda012dba #@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.f3d61e35fff2b9cc977ec6de82618fb1eaf80844e2ac5c4f3ec09b5030530870 -#+ocamlbuild.bc35da2d78e8bc833627c7be860e0db6a47e007b9aa4cb34ae6c020dd96acd13 -#+opam.a023002202499e077521760a07f4d51a55fe8aec320b139b75c741f67358738a -#+ocaml-topkg.571bc624ebe98daebb588300de003c593f5360130e95d41ad176de57e5fd1898 -#+ocaml-astring.12b5fb39fd15799d612d8e4cb95d7418dfb19df62cbd38d235b055a5f40f5fce -#+ocaml-fpath.9c295ba98a3cce9e0c2671dffa83a212532228ff8f5b92127214605298f51eed -#+ocaml-rresult.5a97e18a2e0564bfa45f9ceb31ddba1e4843141fc1480e68963a07231f187deb -#+ocaml-fmt.f62839cf218b642ee07aba0ae856305e1d3d10f4294dfbff5b2fc3618fac311b -#+ocaml-logs.0b9e3454faff2cc18eae94ed561938c3450f143a4d14a94b3ca96aea4b1c87f2 -#+ocaml-mtime.725ecaefee9a5c18ebd31067e5f2d6f5142c06be89f621ac2a6a4181a4fe6ba8 +#+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 #@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.f3d61e35fff2b9cc977ec6de82618fb1eaf80844e2ac5c4f3ec09b5030530870 -#+ocamlbuild.bc35da2d78e8bc833627c7be860e0db6a47e007b9aa4cb34ae6c020dd96acd13 -#+opam.a023002202499e077521760a07f4d51a55fe8aec320b139b75c741f67358738a -#+ocaml-topkg.571bc624ebe98daebb588300de003c593f5360130e95d41ad176de57e5fd1898 +#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d +#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed +#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c +#+ocaml-topkg.bf6907ff38bdef5a729dfbf68e54f72c3212baa4d7768dae2a1856d605019ebc #@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.b31decb75af752b3d16cfbde6cea6a5e3583c7e93305f70825232548d7c1f658 +#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c #@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.b31decb75af752b3d16cfbde6cea6a5e3583c7e93305f70825232548d7c1f658 -#+ocamlbuild.bc35da2d78e8bc833627c7be860e0db6a47e007b9aa4cb34ae6c020dd96acd13 +#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c +#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:. diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib @@ -33,7 +33,7 @@ #+m4.291f5a7d2542242cce6b1948a14ffe3a466805f2eb3ef3ffc413c5a923b9100c #+netbsd-curses.9137bca2b96b754799b50900670f895d68f7fd155a7f779b0b0bd0c3f24f9f66 #+ocaml.69d1e58ac106307b82bf7e9ba058be2c9fd5535a976c89af55c52668225e1e14 -#+ocamlbuild.bc35da2d78e8bc833627c7be860e0db6a47e007b9aa4cb34ae6c020dd96acd13 +#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:. @@ -53,7 +53,10 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/home/ccx/versions/musl.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*'/home/ccx/versions/musl.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1') + return 0 + ;; + (*'/home/ccx/versions/musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') return 0 ;; (*) 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.f3d61e35fff2b9cc977ec6de82618fb1eaf80844e2ac5c4f3ec09b5030530870 -#+ocamlbuild.bc35da2d78e8bc833627c7be860e0db6a47e007b9aa4cb34ae6c020dd96acd13 -#+opam.a023002202499e077521760a07f4d51a55fe8aec320b139b75c741f67358738a -#+ocaml-topkg.571bc624ebe98daebb588300de003c593f5360130e95d41ad176de57e5fd1898 -#+ocaml-cmdliner.b5f540e9cec410d08cd1e17884462596421264f6206d6a27112ebcdcc68a0baa +#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d +#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed +#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c +#+ocaml-topkg.bf6907ff38bdef5a729dfbf68e54f72c3212baa4d7768dae2a1856d605019ebc +#+ocaml-cmdliner.af98da53de0b1c9565cca2f3bf031a3c50d6a75c2bd9fcbb0f1ccdde5e4ba697 #@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.f3d61e35fff2b9cc977ec6de82618fb1eaf80844e2ac5c4f3ec09b5030530870 -#+ocamlbuild.bc35da2d78e8bc833627c7be860e0db6a47e007b9aa4cb34ae6c020dd96acd13 -#+opam.a023002202499e077521760a07f4d51a55fe8aec320b139b75c741f67358738a -#+ocaml-topkg.571bc624ebe98daebb588300de003c593f5360130e95d41ad176de57e5fd1898 -#+ocaml-astring.12b5fb39fd15799d612d8e4cb95d7418dfb19df62cbd38d235b055a5f40f5fce +#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d +#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed +#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c +#+ocaml-topkg.bf6907ff38bdef5a729dfbf68e54f72c3212baa4d7768dae2a1856d605019ebc +#+ocaml-astring.659317c08727f660b42fcd0dd5dbfeb50d9a2933459f0bcd8e170c3019edf855 #@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.f3d61e35fff2b9cc977ec6de82618fb1eaf80844e2ac5c4f3ec09b5030530870 -#+ocamlbuild.bc35da2d78e8bc833627c7be860e0db6a47e007b9aa4cb34ae6c020dd96acd13 -#+opam.a023002202499e077521760a07f4d51a55fe8aec320b139b75c741f67358738a -#+ocaml-topkg.571bc624ebe98daebb588300de003c593f5360130e95d41ad176de57e5fd1898 -#+ocaml-mtime.725ecaefee9a5c18ebd31067e5f2d6f5142c06be89f621ac2a6a4181a4fe6ba8 -#+ocaml-cmdliner.b5f540e9cec410d08cd1e17884462596421264f6206d6a27112ebcdcc68a0baa -#+ocaml-fmt.f62839cf218b642ee07aba0ae856305e1d3d10f4294dfbff5b2fc3618fac311b +#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d +#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed +#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c +#+ocaml-topkg.bf6907ff38bdef5a729dfbf68e54f72c3212baa4d7768dae2a1856d605019ebc +#+ocaml-mtime.faa6c0dff5974dd2c4d2f75e480496024316a230bdb6c3ebbf0ee239f0788902 +#+ocaml-cmdliner.af98da53de0b1c9565cca2f3bf031a3c50d6a75c2bd9fcbb0f1ccdde5e4ba697 +#+ocaml-fmt.c5cfbbeea2f77a42e1fa764f7cd42796bd897667c183fdaeb2bbd9f31ab04929 #@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.b31decb75af752b3d16cfbde6cea6a5e3583c7e93305f70825232548d7c1f658 +#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c #@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.f3d61e35fff2b9cc977ec6de82618fb1eaf80844e2ac5c4f3ec09b5030530870 -#+ocamlbuild.bc35da2d78e8bc833627c7be860e0db6a47e007b9aa4cb34ae6c020dd96acd13 -#+opam.a023002202499e077521760a07f4d51a55fe8aec320b139b75c741f67358738a -#+ocaml-topkg.571bc624ebe98daebb588300de003c593f5360130e95d41ad176de57e5fd1898 +#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d +#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed +#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c +#+ocaml-topkg.bf6907ff38bdef5a729dfbf68e54f72c3212baa4d7768dae2a1856d605019ebc #@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.b31decb75af752b3d16cfbde6cea6a5e3583c7e93305f70825232548d7c1f658 +#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c #@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.b31decb75af752b3d16cfbde6cea6a5e3583c7e93305f70825232548d7c1f658 -#+ocaml-compiler-libs.90ef3930a1b2eefc07dd2db103c21d0b525117de8ab0499f4c20f3d31215066a -#+ocaml-cppo.712cbbd7440012d2bb36b705ef780251fe1295ab02333247a6e06145d57704a3 -#+ocaml-findlib.f3d61e35fff2b9cc977ec6de82618fb1eaf80844e2ac5c4f3ec09b5030530870 -#+ocaml-ppx_derivers.beb8c45b33b3dbfdd4f2d624d0afb68be0f93b9a7aacfe76d41cec8c9abe7955 -#+ocaml-ppxlib.74eae77b90e30fd0e34add267fbe8b2c46cbd97f92bcadd42237edd3dab699a9 -#+ocaml-sexplib0.371a49e39248f172addb97567b1544a93041c2af3f0631cd94ad6d3fed88d8d7 -#+ocaml-stdlib-shims.f7155601dc674dd87fadd47d7ecdab8db91fee107ede35b464f8ec81ec2287a6 +#+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 #@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.b31decb75af752b3d16cfbde6cea6a5e3583c7e93305f70825232548d7c1f658 -#+ocaml-compiler-libs.90ef3930a1b2eefc07dd2db103c21d0b525117de8ab0499f4c20f3d31215066a -#+ocaml-ppx_derivers.beb8c45b33b3dbfdd4f2d624d0afb68be0f93b9a7aacfe76d41cec8c9abe7955 -#+ocaml-sexplib0.371a49e39248f172addb97567b1544a93041c2af3f0631cd94ad6d3fed88d8d7 -#+ocaml-stdlib-shims.f7155601dc674dd87fadd47d7ecdab8db91fee107ede35b464f8ec81ec2287a6 +#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c +#+ocaml-compiler-libs.dd2d8cf2491056df70bc9ed114e61d856c612f6dac2cf5e1b62409a8cad41099 +#+ocaml-ppx_derivers.173a5a02a5493bdab99a38fd4f8d55ed7a6ccb077bda0b9736ce5929e65c65e0 +#+ocaml-sexplib0.91dd8294e2c57cf96407555fb0839a1f6218a186500b861c68996e6eda012dba +#+ocaml-stdlib-shims.3a5f5104012c92583bfb802d8313a7ee4eacd1b772df0f9d423a52cbc0025001 #@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.f3d61e35fff2b9cc977ec6de82618fb1eaf80844e2ac5c4f3ec09b5030530870 -#+ocamlbuild.bc35da2d78e8bc833627c7be860e0db6a47e007b9aa4cb34ae6c020dd96acd13 -#+opam.a023002202499e077521760a07f4d51a55fe8aec320b139b75c741f67358738a -#+ocaml-topkg.571bc624ebe98daebb588300de003c593f5360130e95d41ad176de57e5fd1898 +#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d +#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed +#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c +#+ocaml-topkg.bf6907ff38bdef5a729dfbf68e54f72c3212baa4d7768dae2a1856d605019ebc #@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.b31decb75af752b3d16cfbde6cea6a5e3583c7e93305f70825232548d7c1f658 +#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c #@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.b31decb75af752b3d16cfbde6cea6a5e3583c7e93305f70825232548d7c1f658 +#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c #@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.f3d61e35fff2b9cc977ec6de82618fb1eaf80844e2ac5c4f3ec09b5030530870 -#+ocamlbuild.bc35da2d78e8bc833627c7be860e0db6a47e007b9aa4cb34ae6c020dd96acd13 -#+opam.a023002202499e077521760a07f4d51a55fe8aec320b139b75c741f67358738a +#+ocaml-findlib.2c9107562ec71a13cbbc7acea4b416a577f479e31ca254bf7d7a05a99214b76d +#+ocamlbuild.d18ff38c2f1c29d9e65e135895bc36618511d243841c8c31af6e7218b943fbed +#+opam.8929b72e59d0db6b3c9e2c8b4b983392697114c92eca02aacdc263f709ee744c #@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.b31decb75af752b3d16cfbde6cea6a5e3583c7e93305f70825232548d7c1f658 -#+ocamlbuild.bc35da2d78e8bc833627c7be860e0db6a47e007b9aa4cb34ae6c020dd96acd13 -#+ocaml-base.3730ba913eff8c468303a3f743fa688740bd1a7b064104b39c6cbc8247a532df -#+opam.a023002202499e077521760a07f4d51a55fe8aec320b139b75c741f67358738a -#+ocaml-bos.5561892fbc9e90e25a43db08edac6af368e6a82332beae7a093b0eaa97623912 -#+ocaml-lun.8097d417f3196b07a59e1c36854aec4166cec58d5dc41db6a9b3f78c570e12cc -#+ocaml-ppx_deriving.0e542c980d3d4c46bd12eeeeb3166c83fe888b915072862913e2058540f57e20- \ No newline at end of file +#+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 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.b31decb75af752b3d16cfbde6cea6a5e3583c7e93305f70825232548d7c1f658 +#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:. diff --git a/variants/ccx-x86_64/ocamlbuild b/variants/ccx-x86_64/ocamlbuild @@ -51,7 +51,10 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/home/ccx/versions/musl.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*'/home/ccx/versions/musl.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1') + return 0 + ;; + (*'/home/ccx/versions/musl-cross-make.10ebba8e3da1067169c08b7cccffdc8bb45aefdf61deb3a9b86280d8abd8ff08/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') return 0 ;; (*) 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.b31decb75af752b3d16cfbde6cea6a5e3583c7e93305f70825232548d7c1f658 +#+dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c #@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.b31decb75af752b3d16cfbde6cea6a5e3583c7e93305f70825232548d7c1f658/command/dune' \ + --with-dune='/home/ccx/versions/dune.c00dd4a341c4e0e5adc62bdc9dd9c40f23b351250cd93e630a97d7a741100c7c/command/dune' \ --with-mccs \ --with-vendored-deps \ --enable-static diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune @@ -49,7 +49,10 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/versions/musl.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*'/versions/musl.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1') + return 0 + ;; + (*'/versions/musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') return 0 ;; (*) 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.175c92feb578c772daa906396823d529604a7cdadfc452d76a4242887e0f21a1 -#+ocamlbuild.b18fc0a804aa419b054049db5b5eb20ecebe227e0ac0b2f7199fc890bd6707c9 -#+opam.ac02ffb23edf3b275630db9b308aa0b8d655e851c5dc9e492e7f4fc16e49008a -#+ocaml-topkg.f5303a7af1d52eb8496a7667349e4308e69ef69dddab67cc4bd75416e8d9bf6d +#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f +#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 +#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be +#+ocaml-topkg.6b200d65fb4c48763d16cd6255f1f8d3b7e932dccfca8abd79040d3e2428758b #@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.4096da2597605c2deafc0925edc2e346d0820ebbf505a331a6017e659b7a305b -#+ocaml_intrinsics_kernel.e17c7cd96a59aaf9e12df56ff3ce9f51a8ccd496a3d108f4425ffd7ab2ac6c8b -#+ocaml-sexplib0.95d714fabcbd98e3908133f4713617662dc1c2066388b001aec9a7cbd5966d98 +#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe +#+ocaml_intrinsics_kernel.82c3dc887d1238fdb485d58426525d24ff787f7a7b765e6d417e0fc23caf1065 +#+ocaml-sexplib0.c34138f969d8c6467946dda4095fcfc27440d4b2f2a2dd98564cca27e8930d61 #@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.175c92feb578c772daa906396823d529604a7cdadfc452d76a4242887e0f21a1 -#+ocamlbuild.b18fc0a804aa419b054049db5b5eb20ecebe227e0ac0b2f7199fc890bd6707c9 -#+opam.ac02ffb23edf3b275630db9b308aa0b8d655e851c5dc9e492e7f4fc16e49008a -#+ocaml-topkg.f5303a7af1d52eb8496a7667349e4308e69ef69dddab67cc4bd75416e8d9bf6d -#+ocaml-astring.cbc53be2f4e0cd3375a2f64a1019b6fe5c8af116cb95cb89709345b0bc9182e2 -#+ocaml-fpath.35d3a78326efcbf007a595c25d8e992b9bf804eef58a2622acdd89cef39bc17a -#+ocaml-rresult.811081d79db2aeb655784c046a8961bbc0f29caad1c4cad1b0447f4a3954a8e6 -#+ocaml-fmt.1460094a00e3be20880d0cff4959b0fa8cd78f60639107c27013c958291dedcd -#+ocaml-logs.8ebdb8937eeb0aeadc52e6b3269a7e17133d4ed5098b1ab17e36d24b17d7371b -#+ocaml-mtime.fb8217479a7851b6fb2f682416129841dabad1af195b7765f8e76411fd789a78 +#+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 #@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.175c92feb578c772daa906396823d529604a7cdadfc452d76a4242887e0f21a1 -#+ocamlbuild.b18fc0a804aa419b054049db5b5eb20ecebe227e0ac0b2f7199fc890bd6707c9 -#+opam.ac02ffb23edf3b275630db9b308aa0b8d655e851c5dc9e492e7f4fc16e49008a -#+ocaml-topkg.f5303a7af1d52eb8496a7667349e4308e69ef69dddab67cc4bd75416e8d9bf6d +#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f +#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 +#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be +#+ocaml-topkg.6b200d65fb4c48763d16cd6255f1f8d3b7e932dccfca8abd79040d3e2428758b #@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.4096da2597605c2deafc0925edc2e346d0820ebbf505a331a6017e659b7a305b +#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe #@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.4096da2597605c2deafc0925edc2e346d0820ebbf505a331a6017e659b7a305b -#+ocamlbuild.b18fc0a804aa419b054049db5b5eb20ecebe227e0ac0b2f7199fc890bd6707c9 +#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe +#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:. diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib @@ -33,7 +33,7 @@ #+m4.f098c061d7888597e3affb1019ea369131e6513d63f1bc5e6f43d8d0ac781594 #+netbsd-curses.88f43167ed43bf3f8bbdf74484cd9ba364152ac6b853e6f821bc5aae2e0621c4 #+ocaml.ce7c360344e44cdc9c7f4f13b20b03c9b2f15c86d7f8092507e74323edecd345 -#+ocamlbuild.b18fc0a804aa419b054049db5b5eb20ecebe227e0ac0b2f7199fc890bd6707c9 +#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:. @@ -53,7 +53,10 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/versions/musl.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*'/versions/musl.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1') + return 0 + ;; + (*'/versions/musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') return 0 ;; (*) 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.175c92feb578c772daa906396823d529604a7cdadfc452d76a4242887e0f21a1 -#+ocamlbuild.b18fc0a804aa419b054049db5b5eb20ecebe227e0ac0b2f7199fc890bd6707c9 -#+opam.ac02ffb23edf3b275630db9b308aa0b8d655e851c5dc9e492e7f4fc16e49008a -#+ocaml-topkg.f5303a7af1d52eb8496a7667349e4308e69ef69dddab67cc4bd75416e8d9bf6d -#+ocaml-cmdliner.3c8bcf626602aa5f3a56d3da9b12ec1fbbf2ba6852390bac8a505cd522af4c1d +#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f +#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 +#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be +#+ocaml-topkg.6b200d65fb4c48763d16cd6255f1f8d3b7e932dccfca8abd79040d3e2428758b +#+ocaml-cmdliner.0d775e59b06c6f9f8738ec43d6f5184e34254ceebce4943f5aed2d3724506a30 #@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.175c92feb578c772daa906396823d529604a7cdadfc452d76a4242887e0f21a1 -#+ocamlbuild.b18fc0a804aa419b054049db5b5eb20ecebe227e0ac0b2f7199fc890bd6707c9 -#+opam.ac02ffb23edf3b275630db9b308aa0b8d655e851c5dc9e492e7f4fc16e49008a -#+ocaml-topkg.f5303a7af1d52eb8496a7667349e4308e69ef69dddab67cc4bd75416e8d9bf6d -#+ocaml-astring.cbc53be2f4e0cd3375a2f64a1019b6fe5c8af116cb95cb89709345b0bc9182e2 +#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f +#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 +#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be +#+ocaml-topkg.6b200d65fb4c48763d16cd6255f1f8d3b7e932dccfca8abd79040d3e2428758b +#+ocaml-astring.acc937d32d4c3438085159ca85b7faa45f786bc8e31d154372bde0e927a8a1e0 #@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.175c92feb578c772daa906396823d529604a7cdadfc452d76a4242887e0f21a1 -#+ocamlbuild.b18fc0a804aa419b054049db5b5eb20ecebe227e0ac0b2f7199fc890bd6707c9 -#+opam.ac02ffb23edf3b275630db9b308aa0b8d655e851c5dc9e492e7f4fc16e49008a -#+ocaml-topkg.f5303a7af1d52eb8496a7667349e4308e69ef69dddab67cc4bd75416e8d9bf6d -#+ocaml-mtime.fb8217479a7851b6fb2f682416129841dabad1af195b7765f8e76411fd789a78 -#+ocaml-cmdliner.3c8bcf626602aa5f3a56d3da9b12ec1fbbf2ba6852390bac8a505cd522af4c1d -#+ocaml-fmt.1460094a00e3be20880d0cff4959b0fa8cd78f60639107c27013c958291dedcd +#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f +#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 +#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be +#+ocaml-topkg.6b200d65fb4c48763d16cd6255f1f8d3b7e932dccfca8abd79040d3e2428758b +#+ocaml-mtime.b2375792ebe0ee5f61548837756a2d1ff334fe4bbd2443f7ebff789a9624ca9d +#+ocaml-cmdliner.0d775e59b06c6f9f8738ec43d6f5184e34254ceebce4943f5aed2d3724506a30 +#+ocaml-fmt.41f67e68e6e8703c30a68376177ffe4bd84487f5e3dccc8e81b36c9c2d07bd59 #@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.4096da2597605c2deafc0925edc2e346d0820ebbf505a331a6017e659b7a305b +#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe #@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.175c92feb578c772daa906396823d529604a7cdadfc452d76a4242887e0f21a1 -#+ocamlbuild.b18fc0a804aa419b054049db5b5eb20ecebe227e0ac0b2f7199fc890bd6707c9 -#+opam.ac02ffb23edf3b275630db9b308aa0b8d655e851c5dc9e492e7f4fc16e49008a -#+ocaml-topkg.f5303a7af1d52eb8496a7667349e4308e69ef69dddab67cc4bd75416e8d9bf6d +#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f +#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 +#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be +#+ocaml-topkg.6b200d65fb4c48763d16cd6255f1f8d3b7e932dccfca8abd79040d3e2428758b #@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.4096da2597605c2deafc0925edc2e346d0820ebbf505a331a6017e659b7a305b +#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe #@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.4096da2597605c2deafc0925edc2e346d0820ebbf505a331a6017e659b7a305b -#+ocaml-compiler-libs.6beb9554c000a1d55f9d800df9ff0565a4d49dcfcb777be7c74ed7cce7dee898 -#+ocaml-cppo.242ea6598b1a850513493e49b807b44568252fa6aa439e7317a59bdbdc19c321 -#+ocaml-findlib.175c92feb578c772daa906396823d529604a7cdadfc452d76a4242887e0f21a1 -#+ocaml-ppx_derivers.71a4eb986dc48c300c89845b8f23957d6d4f64383ed57621478c88f1cd4d14a2 -#+ocaml-ppxlib.124af31b04b8bf69ef5cb12c82adcd73b3c95710dae6b9e1a82d592866562ed8 -#+ocaml-sexplib0.95d714fabcbd98e3908133f4713617662dc1c2066388b001aec9a7cbd5966d98 -#+ocaml-stdlib-shims.6a40bd3f6fd298c98ec7ccd2f00194e28d8c3843ca4a082e5bc8b411e6c0381c +#+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 #@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.4096da2597605c2deafc0925edc2e346d0820ebbf505a331a6017e659b7a305b -#+ocaml-compiler-libs.6beb9554c000a1d55f9d800df9ff0565a4d49dcfcb777be7c74ed7cce7dee898 -#+ocaml-ppx_derivers.71a4eb986dc48c300c89845b8f23957d6d4f64383ed57621478c88f1cd4d14a2 -#+ocaml-sexplib0.95d714fabcbd98e3908133f4713617662dc1c2066388b001aec9a7cbd5966d98 -#+ocaml-stdlib-shims.6a40bd3f6fd298c98ec7ccd2f00194e28d8c3843ca4a082e5bc8b411e6c0381c +#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe +#+ocaml-compiler-libs.504742f149321ddaaf13e3ce60d633d137b3144430eb47795d10033f43e4fa72 +#+ocaml-ppx_derivers.d08c41e581b011381e58a6337f1c3b490676a37a7b370baf71a1c2d1a853762a +#+ocaml-sexplib0.c34138f969d8c6467946dda4095fcfc27440d4b2f2a2dd98564cca27e8930d61 +#+ocaml-stdlib-shims.8069b05ecdfbae84e80e00aa3a78520c8c86a6c865dcb002a2a97067c7291f9b #@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.175c92feb578c772daa906396823d529604a7cdadfc452d76a4242887e0f21a1 -#+ocamlbuild.b18fc0a804aa419b054049db5b5eb20ecebe227e0ac0b2f7199fc890bd6707c9 -#+opam.ac02ffb23edf3b275630db9b308aa0b8d655e851c5dc9e492e7f4fc16e49008a -#+ocaml-topkg.f5303a7af1d52eb8496a7667349e4308e69ef69dddab67cc4bd75416e8d9bf6d +#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f +#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 +#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be +#+ocaml-topkg.6b200d65fb4c48763d16cd6255f1f8d3b7e932dccfca8abd79040d3e2428758b #@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.4096da2597605c2deafc0925edc2e346d0820ebbf505a331a6017e659b7a305b +#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe #@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.4096da2597605c2deafc0925edc2e346d0820ebbf505a331a6017e659b7a305b +#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe #@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.175c92feb578c772daa906396823d529604a7cdadfc452d76a4242887e0f21a1 -#+ocamlbuild.b18fc0a804aa419b054049db5b5eb20ecebe227e0ac0b2f7199fc890bd6707c9 -#+opam.ac02ffb23edf3b275630db9b308aa0b8d655e851c5dc9e492e7f4fc16e49008a +#+ocaml-findlib.36ccd1eb40c65e5838e2b79a0b7935c1e1a3690e7ff19330721b9c7388775d7f +#+ocamlbuild.0303fc01076eee8c314dfcb1da70badc55b7f7eb77a50167e45908bcf82b5eb4 +#+opam.52e1fd64644f621d651089aef7918ea7c3264f10f6f097a46faac6f47ed8e3be #@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.4096da2597605c2deafc0925edc2e346d0820ebbf505a331a6017e659b7a305b -#+ocamlbuild.b18fc0a804aa419b054049db5b5eb20ecebe227e0ac0b2f7199fc890bd6707c9 -#+ocaml-base.21c7e9b183b0247d63376e4cd75f5c8080d150986d7c9e8c1f8d5eae864ce1b5 -#+opam.ac02ffb23edf3b275630db9b308aa0b8d655e851c5dc9e492e7f4fc16e49008a -#+ocaml-bos.b25ac080ad981dc5fa656a8b809f465063d4c1237039cc051b72087dce1744fc -#+ocaml-lun.8aeea4b2c7e0ea54c1cb0f0f635795f29d24ea985c1a3298176d8f89cf8bbd97 -#+ocaml-ppx_deriving.57783c8e0965ceda43ecaf23c6cf227ccb530ec99efa7320488e8edfa2216d6e- \ No newline at end of file +#+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 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.4096da2597605c2deafc0925edc2e346d0820ebbf505a331a6017e659b7a305b +#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:. diff --git a/variants/root-x86_64/ocamlbuild b/variants/root-x86_64/ocamlbuild @@ -51,7 +51,10 @@ check_dynamic() { printf '%s\n' "Error: '$1' is not a dynamic binary!" exit 1 ;; - (*'/versions/musl.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + (*'/versions/musl.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664/x86_64-linux-musl/library.so/ld-musl-x86_64.so.1') + return 0 + ;; + (*'/versions/musl-cross-make.8111e2fa2c8d6e1c5b822df38d47c2645e8468448e34767270b5d22eb23934cd/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') return 0 ;; (*) 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.4096da2597605c2deafc0925edc2e346d0820ebbf505a331a6017e659b7a305b +#+dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe #@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.4096da2597605c2deafc0925edc2e346d0820ebbf505a331a6017e659b7a305b/command/dune' \ + --with-dune='/versions/dune.e9f4807d9f20a0ce85eaa784e0a0f6e55dae401afbdea06705a6d322396fefbe/command/dune' \ --with-mccs \ --with-vendored-deps \ --enable-static