From e37333798c8e2357687b091ec2c95a4e75d93931 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Sat, 12 Apr 2025 13:26:52 +0200 Subject: [PATCH] panfrost: build panfrost_compile for -Dtools=panfrost This allows building tools for cross-compiling without building gallium or vulkan drivers unnecessarily. Backport-to: 25.1 Reviewed-by: Boris Brezillon Signed-off-by: Janne Grunau Part-of: (cherry picked from commit 674c96ad0a4a9b57342c90135fbceb696d7aae46) --- .pick_status.json | 2 +- docs/drivers/panfrost.rst | 4 ++-- src/panfrost/meson.build | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3cc67e2e96c..c4096e44719 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -234,7 +234,7 @@ "description": "panfrost: build panfrost_compile for -Dtools=panfrost", "nominated": true, "nomination_type": 4, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/docs/drivers/panfrost.rst b/docs/drivers/panfrost.rst index a3fa495aba9..854bb804a17 100644 --- a/docs/drivers/panfrost.rst +++ b/docs/drivers/panfrost.rst @@ -60,8 +60,8 @@ LLVM is required by Panfrost's compilers at build time. In case of cross compilation without LLVM, you can build and install the required tools on the host (with LLVM installed) with -``meson . build-host/ -Dvulkan-drivers=panfrost -Dgallium-drivers=panfrost --Dmesa-clc=enabled -Dinstall-mesa-clc=true -Dprecomp-compiler=enabled -Dinstall-precomp-compiler=true`` +``meson . build-host/ -Dtools=panfrost -Dmesa-clc=enabled -Dinstall-mesa-clc=true +-Dprecomp-compiler=enabled -Dinstall-precomp-compiler=true`` and then use ``-Dmesa-clc=system -Dprecomp-compiler=system`` on the cross compile side. For general information on building Mesa, read :doc:`the install documentation diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build index 5a160067d6e..a8e00d2b82a 100644 --- a/src/panfrost/meson.build +++ b/src/panfrost/meson.build @@ -15,9 +15,12 @@ subdir('util') subdir('midgard') subdir('compiler') -if with_gallium_panfrost or with_panfrost_vk +if with_gallium_panfrost or with_panfrost_vk or with_tools.contains('panfrost') subdir('lib') subdir('clc') +endif + +if with_gallium_panfrost or with_panfrost_vk subdir('libpan') subdir('perf') endif