diff --git a/packaging/flatpak/net.catcrafts.CrafterBuild.yaml b/packaging/flatpak/net.catcrafts.CrafterBuild.yaml index 9eeb64f..e95288d 100644 --- a/packaging/flatpak/net.catcrafts.CrafterBuild.yaml +++ b/packaging/flatpak/net.catcrafts.CrafterBuild.yaml @@ -106,8 +106,8 @@ modules: - /bin/scan-view sources: - type: archive - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-22.1.8/llvm-project-22.1.8.src.tar.xz - sha256: 922f1817a0df7b1489272d18134ee0087a8b068828f87ac63b9861b1a9965888 + url: https://github.com/llvm/llvm-project/releases/download/llvmorg-23.1.2/llvm-project-23.1.2.src.tar.xz + sha256: c98bbef08a2b4c2613cd50e9aa9ae7b69b1fe6c16b2c40373bc0ab6116fdf78a - name: wasi-sysroot # wasi-sdk's sysroot-only mode, driven by the clang built above: @@ -155,9 +155,21 @@ modules: commit: 2e6fb9d8ee0cdf9e431fbcabe8af3115de000a13 dest: src/wasi-libc - type: archive - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-22.1.8/llvm-project-22.1.8.src.tar.xz - sha256: 922f1817a0df7b1489272d18134ee0087a8b068828f87ac63b9861b1a9965888 + url: https://github.com/llvm/llvm-project/releases/download/llvmorg-23.1.2/llvm-project-23.1.2.src.tar.xz + sha256: c98bbef08a2b4c2613cd50e9aa9ae7b69b1fe6c16b2c40373bc0ab6116fdf78a dest: src/llvm-project + # wasi-sdk patches its LLVM tree before building libc++ (`git apply` in + # src/llvm-project), and upstream that directory is a submodule, a + # repository of its own. Unpacked from a tarball it is a plain + # subdirectory of the wasi-sdk checkout, where git treats the patched + # paths as outside the current directory, skips every one of them and + # exits 0. LLVM 22 happened to build without the patches; LLVM 23's + # libc++ does not compile for WASI without one of them. Making the tree + # a repository lets wasi-sdk's own patch step do what it does upstream, + # with whatever patch list the pinned tag carries. + - type: shell + commands: + - git init -q src/llvm-project - type: file path: wasi-host-toolchain.cmake