1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Sat, 9 May 2026 01:37:16 +0100
Subject: [PATCH] teflon: make linked NPU driver dependencies conditional
libteflon unconditionally linked driver_etnaviv, driver_rocket and
driver_ethosu, even when the corresponding gallium driver is disabled,
causing a link failure. Build the dependency list conditionally on
with_gallium_etnaviv/with_gallium_rocket/with_gallium_ethosu instead.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
src/gallium/targets/teflon/meson.build | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
--- a/src/gallium/targets/teflon/meson.build
+++ b/src/gallium/targets/teflon/meson.build
@@ -1,3 +1,14 @@
+teflon_deps = [idep_nir, idep_mesautil]
+if with_gallium_etnaviv
+ teflon_deps += driver_etnaviv
+endif
+if with_gallium_rocket
+ teflon_deps += driver_rocket
+endif
+if with_gallium_ethosu
+ teflon_deps += driver_ethosu
+endif
+
libteflon = shared_library(
'teflon',
[ 'teflon_target.c' ],
@@ -6,13 +17,7 @@ libteflon = shared_library(
link_with : [libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri, libgallium ],
gnu_symbol_visibility : 'hidden',
link_args : ld_args_build_id,
- dependencies : [
- driver_etnaviv,
- driver_rocket,
- driver_ethosu,
- idep_nir,
- idep_mesautil,
- ],
+ dependencies : teflon_deps,
install : true,
)
|
