Merge remote-tracking branch 'origin/16' into snapshot

This commit is contained in:
Sylvestre Ledru 2023-07-14 09:45:04 +02:00
commit 21f9bfb9a7
3 changed files with 3 additions and 2 deletions

1
debian/changelog vendored
View File

@ -57,6 +57,7 @@ llvm-toolchain-16 (1:16.0.6-5) UNRELEASED; urgency=medium
[ Samuel Thibault ]
* Fix hurd build by fixing Linux-specific lines.
* Fix wasi-libc build-deps on i386 !linux-i386
[ Sylvestre Ledru ]
* set -DCMAKE_SYSTEM_NAME=Generic to build wasm to fix upstream #63799

2
debian/control vendored
View File

@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
spirv-tools [ linux-any ] | hello [ !i386],
wasi-libc | hello [ !i386],
wasi-libc | hello [ !any-i386],
libcurl4-dev,
libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],

2
debian/control.in vendored
View File

@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
spirv-tools [ linux-any ] | hello [ !i386],
wasi-libc | hello [ !i386],
wasi-libc | hello [ !any-i386],
libcurl4-dev,
libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],