mesa-aco: can't build rusticl on i386

Fixes #14
ernstp · Feb 23, 2023 · 8fd24a7 · 8fd24a7
1 parent e971c6f
commit 8fd24a7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/mesa-aco/debian/control b/mesa-aco/debian/control
@@ -54,8 +54,8 @@ Build-Depends:
  zlib1g-dev,
  libglvnd-core-dev (>= 1.3.2),
  valgrind [amd64 arm64 armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x],
- bindgen,
- rustc,
+ bindgen [amd64],
+ rustc [amd64],
 Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git
 Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa
 Homepage: https://mesa3d.org/

diff --git a/mesa-aco/debian/rules b/mesa-aco/debian/rules
@@ -12,9 +12,6 @@ DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
-dpkg_late_eval ?= $(or $(value DPKG_CACHE_$(1)),$(eval DPKG_CACHE_$(1) := $(shell $(2)))$(value DPKG_CACHE_$(1)))
-DEB_DISTRIBUTION = $(call dpkg_late_eval,DEB_DISTRIBUTION,dpkg-parsechangelog -SDistribution)
-
 # for finding the correct llvm-config when meson doesn't know about it yet
 export PATH:=/usr/lib/llvm-15/bin/:/usr/lib/llvm-14/bin/:/usr/lib/llvm-13/bin/:/usr/lib/llvm-12/bin/:/usr/lib/llvm-11/bin/:$(PATH)
 
@@ -128,7 +125,7 @@ else
 	GALLIUM_DRIVERS += radeonsi
 	confflags_GALLIUM += -Dllvm=enabled
 	confflags_GALLIUM += -Dgallium-opencl=icd
-	ifneq ($(DEB_DISTRIBUTION),focal)
+	ifeq ($(DEB_HOST_ARCH),amd64)
 		confflags_GALLIUM += -Dgallium-rusticl=true
 	endif
 

diff --git a/mesa-aco/settings.sh b/mesa-aco/settings.sh
@@ -3,5 +3,5 @@ GIT="https://gitlab.freedesktop.org/mesa/mesa.git"
 GITBRANCH="main"
 DISTROS="focal jammy kinetic lunar"
 PREBUMP=1
-INC=2
+INC=3
 PPA=mesaaco