Skip to content

Commit

Permalink
mesa-aco: rusticl attempt number #14
Browse files Browse the repository at this point in the history
  • Loading branch information
ernstp committed Feb 23, 2023
1 parent ed20c34 commit 00895cc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
6 changes: 3 additions & 3 deletions mesa-aco/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ Source: mesa
Section: graphics
Priority: optional
Maintainer: Ernst Sjöstrand <[email protected]>
Uploaders: Andreas Boll <[email protected]>
Standards-Version: 4.1.4
Build-Depends:
debhelper (>= 11),
Expand Down Expand Up @@ -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/
Expand Down
11 changes: 9 additions & 2 deletions mesa-aco/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 00895cc

Please sign in to comment.