From ff4e963f21ceb4d0e308ea71650472a85b5ca2e7 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Tue, 17 Sep 2024 19:21:31 +0300 Subject: [PATCH] Try fixing mesa-git again --- .github/release-debian-v3 | 2 +- .github/release-nest-i386 | 2 +- debian/control | 2 +- debian/rules | 2 +- main.sh | 8 ++++++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/release-debian-v3 b/.github/release-debian-v3 index 3cacc0b..ca7bf83 100644 --- a/.github/release-debian-v3 +++ b/.github/release-debian-v3 @@ -1 +1 @@ -12 \ No newline at end of file +13 \ No newline at end of file diff --git a/.github/release-nest-i386 b/.github/release-nest-i386 index 9d60796..ca7bf83 100644 --- a/.github/release-nest-i386 +++ b/.github/release-nest-i386 @@ -1 +1 @@ -11 \ No newline at end of file +13 \ No newline at end of file diff --git a/debian/control b/debian/control index 16f8c20..8576d4b 100644 --- a/debian/control +++ b/debian/control @@ -65,7 +65,7 @@ Build-Depends: bindgen (>= 0.66.1~) [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], cbindgen [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], llvm-spirv-18 [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], - libllvmspirvlib-18-dev [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libllvmspirvlib-18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], librust-paste-dev [amd64 arm64 armhf ppc64 riscv64 x32], librust-syn-dev [amd64 arm64 armhf ppc64 riscv64 x32], Rules-Requires-Root: no diff --git a/debian/rules b/debian/rules index 9edd37d..7f0e3e5 100755 --- a/debian/rules +++ b/debian/rules @@ -54,7 +54,7 @@ confflags_OSMESA = -Dosmesa=true confflags_SSE2 = -Dsse2=true confflags_TEFLON = -Dteflon=false -LLVM_ARCHS = amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32 +LLVM_ARCHS = amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32 RUSTICL_ARCHS = amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32 NVK_ARCHS = amd64 arm64 armhf ppc64 riscv64 x32 VALGRIND_ARCHS = amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x diff --git a/main.sh b/main.sh index b3b8bdf..af95e3b 100755 --- a/main.sh +++ b/main.sh @@ -8,6 +8,14 @@ echo "$PIKA_BUILD_ARCH" > pika-build-arch VERSION="24.4" +# TEMP I386 SPECFIC FIX +if [[ "$PIKA_BUILD_ARCH" == "i386" ]] +then + wget http://ftp.us.debian.org/debian/pool/main/s/spirv-llvm-translator-18/libllvmspirvlib-18-dev_18.1.4-1_i386.deb -O ./32bit-spirv.deb + apt install -y ./32bit-spirv.deb +fi +# + # Clone Upstream git clone https://gitlab.freedesktop.org/mesa/mesa mesa-git cp -rvf ./debian ./mesa-git/