OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: use [] instead of 'lib for !windows name_prefix

Browse Source 
This is a poorly documented value that uses the default value, but
doesn't emit a warning. In the future Meson will fix this.

Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20752>
This commit is contained in:
Dylan Baker
2023-01-17 10:09:18 -08:00
committed by Marge Bot
parent a79e6457d8
commit 7aca37fc28
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/amd/vulkan/meson.build
View File

@@ -200,7 +200,7 @@ libvulkan_radeon = shared_library(
],
link_depends : [libvulkan_radeon_link_depends,],
gnu_symbol_visibility : 'hidden',
name_prefix : host_machine.system() == 'windows' ? '' : 'lib',
name_prefix : host_machine.system() == 'windows' ? '' : [],
install : true,
)

2
src/gallium/targets/lavapipe/meson.build
View File

@@ -10,7 +10,7 @@ libvulkan_lvp = shared_library(
gnu_symbol_visibility : 'hidden',
link_args : [ld_args_bsymbolic, ld_args_gc_sections],
dependencies : driver_swrast,
name_prefix : host_machine.system() == 'windows' ? '' : 'lib',
name_prefix : host_machine.system() == 'windows' ? '' : [],
install : true,
)

2
src/gallium/targets/opencl/meson.build
View File

@@ -109,7 +109,7 @@ libopencl = shared_library(
idep_mesautil,
dep_clock, dep_dl, dep_unwind, dep_elf, dep_clang, dep_version
],
name_prefix : host_machine.system() == 'windows' ? '' : 'lib', # otherwise mingw will create libOpenCL-1.dll or libMesaOpenCL-1.dll
name_prefix : host_machine.system() == 'windows' ? '' : [], # otherwise mingw will create libOpenCL-1.dll or libMesaOpenCL-1.dll
version : '@0@.0.0'.format(opencl_version),
soversion : host_machine.system() == 'windows' ? '' : opencl_version,
install : true,

2
src/gallium/targets/osmesa/meson.build
View File

@@ -57,7 +57,7 @@ libosmesa = shared_library(
dependencies : [
dep_ws2_32, dep_selinux, dep_thread, dep_clock, dep_unwind, driver_swrast
],
name_prefix : host_machine.system() == 'windows' ? '' : 'lib', # otherwise mingw will create libosmesa.dll
name_prefix : host_machine.system() == 'windows' ? '' : [], # otherwise mingw will create libosmesa.dll
soversion : host_machine.system() == 'windows' ? '' : '8',
version : '8.0.0',
darwin_versions : '9.0.0',

2
src/microsoft/vulkan/meson.build
View File

@@ -89,7 +89,7 @@ libvulkan_dzn = shared_library(
cpp_args : dzn_cpp_flags,
gnu_symbol_visibility : 'hidden',
link_args : [ld_args_bsymbolic, ld_args_gc_sections],
name_prefix : host_machine.system() == 'windows' ? '' : 'lib',
name_prefix : host_machine.system() == 'windows' ? '' : [],
install : true,
)