meson: drop pthread-stubs dependency on BSDs

pthread-stubs >= 0.4 simply passes -pthread which is similar to what
dependency('threads') returns. And make it a private dependency
for subprojects even on Linux.

Reviewed-by: Emmanuel Vadot <manu@FreeBSD.org>
main
Jan Beich 2021-09-08 09:14:20 +00:00
parent c6d6dce99f
commit 332809f3ee
10 changed files with 9 additions and 14 deletions

View File

@ -68,7 +68,7 @@ stages:
variables: variables:
BUILD_OS: freebsd BUILD_OS: freebsd
FDO_DISTRIBUTION_VERSION: "13.0" FDO_DISTRIBUTION_VERSION: "13.0"
FDO_DISTRIBUTION_PACKAGES: 'meson ninja pkgconf libpciaccess libpthread-stubs py39-docutils cairo' FDO_DISTRIBUTION_PACKAGES: 'meson ninja pkgconf libpciaccess py39-docutils cairo'
# bump this tag every time you change something which requires rebuilding the # bump this tag every time you change something which requires rebuilding the
# base image # base image
FDO_DISTRIBUTION_TAG: "2022-08-22.0" FDO_DISTRIBUTION_TAG: "2022-08-22.0"

View File

@ -36,7 +36,7 @@ libdrm_amdgpu = library(
], ],
include_directories : [inc_root, inc_drm], include_directories : [inc_root, inc_drm],
link_with : libdrm, link_with : libdrm,
dependencies : [dep_pthread_stubs, dep_atomic_ops, dep_rt], dependencies : [dep_threads, dep_atomic_ops, dep_rt],
version : '1.0.0', version : '1.0.0',
install : true, install : true,
) )

View File

@ -32,7 +32,7 @@ libdrm_etnaviv = library(
link_with : libdrm, link_with : libdrm,
c_args : libdrm_c_args, c_args : libdrm_c_args,
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
dependencies : [dep_pthread_stubs, dep_rt, dep_atomic_ops], dependencies : [dep_threads, dep_rt, dep_atomic_ops],
version : '1.0.0', version : '1.0.0',
install : true, install : true,
) )

View File

@ -25,7 +25,7 @@ libdrm_exynos = library(
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
include_directories : [inc_root, inc_drm], include_directories : [inc_root, inc_drm],
link_with : libdrm, link_with : libdrm,
dependencies : [dep_pthread_stubs], dependencies : [dep_threads],
version : '1.0.0', version : '1.0.0',
install : true, install : true,
) )

View File

@ -44,7 +44,7 @@ libdrm_freedreno = library(
[files_freedreno, config_file], [files_freedreno, config_file],
c_args : libdrm_c_args, c_args : libdrm_c_args,
include_directories : [inc_root, inc_drm], include_directories : [inc_root, inc_drm],
dependencies : [dep_valgrind, dep_pthread_stubs, dep_rt, dep_atomic_ops], dependencies : [dep_valgrind, dep_threads, dep_rt, dep_atomic_ops],
link_with : libdrm, link_with : libdrm,
version : '1.0.0', version : '1.0.0',
install : true, install : true,

View File

@ -29,7 +29,7 @@ libdrm_intel = library(
], ],
include_directories : [inc_root, inc_drm], include_directories : [inc_root, inc_drm],
link_with : libdrm, link_with : libdrm,
dependencies : [dep_pciaccess, dep_pthread_stubs, dep_rt, dep_valgrind, dep_atomic_ops], dependencies : [dep_pciaccess, dep_threads, dep_rt, dep_valgrind, dep_atomic_ops],
c_args : libdrm_c_args, c_args : libdrm_c_args,
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
version : '1.0.0', version : '1.0.0',

View File

@ -40,11 +40,6 @@ with_freedreno_kgsl = get_option('freedreno-kgsl')
with_install_tests = get_option('install-test-programs') with_install_tests = get_option('install-test-programs')
with_tests = get_option('tests') with_tests = get_option('tests')
if ['freebsd', 'dragonfly', 'netbsd'].contains(host_machine.system())
dep_pthread_stubs = dependency('pthread-stubs', version : '>= 0.4')
else
dep_pthread_stubs = []
endif
dep_threads = dependency('threads') dep_threads = dependency('threads')
cc = meson.get_compiler('c') cc = meson.get_compiler('c')

View File

@ -25,7 +25,7 @@ libdrm_omap = library(
c_args : libdrm_c_args, c_args : libdrm_c_args,
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
link_with : libdrm, link_with : libdrm,
dependencies : [dep_pthread_stubs, dep_atomic_ops], dependencies : [dep_threads, dep_atomic_ops],
version : '1.0.0', version : '1.0.0',
install : true, install : true,
) )

View File

@ -32,7 +32,7 @@ libdrm_radeon = library(
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
include_directories : [inc_root, inc_drm], include_directories : [inc_root, inc_drm],
link_with : libdrm, link_with : libdrm,
dependencies : [dep_pthread_stubs, dep_atomic_ops], dependencies : [dep_threads, dep_atomic_ops],
version : '1.0.1', version : '1.0.1',
install : true, install : true,
) )

View File

@ -28,7 +28,7 @@ libdrm_tegra = library(
], ],
include_directories : [inc_root, inc_drm], include_directories : [inc_root, inc_drm],
link_with : libdrm, link_with : libdrm,
dependencies : [dep_pthread_stubs, dep_atomic_ops], dependencies : [dep_threads, dep_atomic_ops],
c_args : libdrm_c_args, c_args : libdrm_c_args,
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
version : '0.0.0', version : '0.0.0',