fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-30 23:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

virtio/kumquat: fixes to enable meson2hermetic

Browse source 
The "log" dependency has loaded connotations since it's already
used for ALOGE(..) via the fake Android pkg-config files.

Use "rust-log" and "rust-libc" to mirror the clearer Debian
naming conventions.

Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39279>
This commit is contained in:
Gurchetan Singh 2025-12-18 17:36:50 -08:00 • committed by Marge Bot
parent cf3f556312
commit f38a25fd6b
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/virtio/virtgpu_kumquat_ffi/meson.build
View file

@ -3,12 +3,18 @@
inc_virtgpu_kumquat_ffi = include_directories('include')
dep_log = dependency('log',
dep_rust_log = dependency('rust-log',
version: '>= 0.4.22',
fallback: ['log-0.4-rs', 'dep_log'],
required: true,
)
dep_rust_libc = dependency('rust-libc',
version: '>= 0.2.168',
fallback: ['libc-0.2-rs', 'dep_libc'],
required: true,
)
virtgpu_kumquat_ffi_args = [
# we want unsafe blocks inside unsafe functions
'-Dunsafe_op_in_unsafe_fn',
@ -24,7 +30,7 @@ libvirtgpu_kumquat_ffi = static_library(
virtgpu_kumquat_ffi_args,
],
link_with: [libmesa_protocols, libmesa_rust_util, libvirtgpu_kumquat],
dependencies: [dep_mesa3d_util, dep_log]
dependencies: [dep_mesa3d_util, dep_rust_log, dep_rust_libc]
)
dep_virtgpu_kumquat_ffi = declare_dependency(