From 00895cc2664b9867889d1ffc6368bca3b263f41e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ernst=20Sj=C3=B6strand?= Date: Thu, 23 Feb 2023 12:30:42 +0100 Subject: [PATCH] mesa-aco: rusticl attempt number #14 --- mesa-aco/debian/control | 6 +++--- mesa-aco/debian/rules | 11 +++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/mesa-aco/debian/control b/mesa-aco/debian/control index 214bbe9..80adf16 100644 --- a/mesa-aco/debian/control +++ b/mesa-aco/debian/control @@ -2,7 +2,6 @@ Source: mesa Section: graphics Priority: optional Maintainer: Ernst Sjöstrand -Uploaders: Andreas Boll Standards-Version: 4.1.4 Build-Depends: debhelper (>= 11), @@ -54,8 +53,9 @@ Build-Depends: zlib1g-dev, libglvnd-core-dev (>= 1.3.2), valgrind [amd64 arm64 armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x], - bindgen [amd64], - rustc [amd64], +# Bindgen is not available on focal + bindgen [amd64] | bash-doc, + rustc [amd64] | bash-doc, 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 index 8210002..5be6606 100755 --- a/mesa-aco/debian/rules +++ b/mesa-aco/debian/rules @@ -12,6 +12,9 @@ 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) @@ -125,8 +128,12 @@ else GALLIUM_DRIVERS += radeonsi confflags_GALLIUM += -Dllvm=enabled confflags_GALLIUM += -Dgallium-opencl=icd - ifeq ($(DEB_HOST_ARCH),amd64) - confflags_GALLIUM += -Dgallium-rusticl=true + + # Rusticl! + ifneq ($(DEB_DISTRIBUTION),focal) + ifeq ($(DEB_HOST_ARCH),amd64) + confflags_GALLIUM += -Dgallium-rusticl=true + endif endif # nine makes sense only on archs that build wine