From 01437f41cea688f11380afcf98024236ea38c4b9 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Fri, 14 Jul 2023 09:44:37 +0200 Subject: [PATCH] Fix wasi-libc build-deps on i386 !linux-i386 --- debian/changelog | 1 + debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index feff9902..56b63f2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,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 diff --git a/debian/control b/debian/control index 013d43cb..915ff78b 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] | llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] | 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], diff --git a/debian/control.in b/debian/control.in index 319558d9..fc183864 100644 --- a/debian/control.in +++ b/debian/control.in @@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] | llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] | 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],