From 8781aef6b4349420cb715e89378c0a329fa735ba Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sat, 19 Nov 2022 15:17:17 -0500 Subject: [PATCH] asahi: Make libasahi_lib depend on libasahi_decode The track_alloc and track_free symbols are used, we need to link them in. Depending on build flags / environment / etc, fixes the potential build error hit by a CI job: mold: error: undefined symbol: agxdecode_track_alloc >>> referenced by agx_device.c >>> src/asahi/lib/libasahi_lib.a(src/asahi/lib/libasahi_lib.a.p/agx_device.c.o):(agx_shmem_alloc)>>> referenced by agx_device.c >>> src/asahi/lib/libasahi_lib.a(src/asahi/lib/libasahi_lib.a.p/agx_device.c.o):(agx_bo_create) mold: error: undefined symbol: agxdecode_track_free >>> referenced by agx_device.c >>> src/asahi/lib/libasahi_lib.a(src/asahi/lib/libasahi_lib.a.p/agx_device.c.o):(agx_bo_unreference) ...when trying to link with libasahi_lib without libasahi_decode for unit tests. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/asahi/lib/meson.build | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/asahi/lib/meson.build b/src/asahi/lib/meson.build index e7a3979..14ba74f 100644 --- a/src/asahi/lib/meson.build +++ b/src/asahi/lib/meson.build @@ -46,23 +46,24 @@ idep_agx_pack = declare_dependency( include_directories : include_directories('.'), ) -libasahi_lib = static_library( - 'asahi_lib', - [libasahi_lib_files, agx_pack], +libasahi_decode = static_library( + 'asahi_decode', + [libasahi_decode_files, agx_pack], include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_asahi], + dependencies : [dep_valgrind, idep_mesautil], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', - dependencies: [dep_libdrm, dep_valgrind, idep_nir, dep_iokit], build_by_default : false, ) -libasahi_decode = static_library( - 'asahi_decode', - [libasahi_decode_files, agx_pack], +libasahi_lib = static_library( + 'asahi_lib', + [libasahi_lib_files, agx_pack], include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_asahi], - dependencies : [dep_valgrind, idep_mesautil], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', + link_with: [libasahi_decode], + dependencies: [dep_libdrm, dep_valgrind, idep_nir, dep_iokit], build_by_default : false, ) -- 2.7.4