diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a3ed214..5379476e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,7 +68,7 @@ stages: variables: BUILD_OS: freebsd 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 # base image FDO_DISTRIBUTION_TAG: "2022-08-22.0" diff --git a/amdgpu/meson.build b/amdgpu/meson.build index a1cca5a2..20bf6244 100644 --- a/amdgpu/meson.build +++ b/amdgpu/meson.build @@ -36,7 +36,7 @@ libdrm_amdgpu = library( ], include_directories : [inc_root, inc_drm], link_with : libdrm, - dependencies : [dep_pthread_stubs, dep_atomic_ops, dep_rt], + dependencies : [dep_threads, dep_atomic_ops, dep_rt], version : '1.0.0', install : true, ) diff --git a/etnaviv/meson.build b/etnaviv/meson.build index 591f20f0..9ccf8696 100644 --- a/etnaviv/meson.build +++ b/etnaviv/meson.build @@ -32,7 +32,7 @@ libdrm_etnaviv = library( link_with : libdrm, c_args : libdrm_c_args, 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', install : true, ) diff --git a/exynos/meson.build b/exynos/meson.build index 2f02ae71..6b4fe1e9 100644 --- a/exynos/meson.build +++ b/exynos/meson.build @@ -25,7 +25,7 @@ libdrm_exynos = library( gnu_symbol_visibility : 'hidden', include_directories : [inc_root, inc_drm], link_with : libdrm, - dependencies : [dep_pthread_stubs], + dependencies : [dep_threads], version : '1.0.0', install : true, ) diff --git a/freedreno/meson.build b/freedreno/meson.build index de9ee148..5ba1a3f1 100644 --- a/freedreno/meson.build +++ b/freedreno/meson.build @@ -44,7 +44,7 @@ libdrm_freedreno = library( [files_freedreno, config_file], c_args : libdrm_c_args, 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, version : '1.0.0', install : true, diff --git a/intel/meson.build b/intel/meson.build index beea42a6..4af2a357 100644 --- a/intel/meson.build +++ b/intel/meson.build @@ -29,7 +29,7 @@ libdrm_intel = library( ], include_directories : [inc_root, inc_drm], 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, gnu_symbol_visibility : 'hidden', version : '1.0.0', diff --git a/meson.build b/meson.build index 8dcacb94..3c2e171d 100644 --- a/meson.build +++ b/meson.build @@ -40,11 +40,6 @@ with_freedreno_kgsl = get_option('freedreno-kgsl') with_install_tests = get_option('install-test-programs') 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') cc = meson.get_compiler('c') diff --git a/omap/meson.build b/omap/meson.build index 22159184..eebd1420 100644 --- a/omap/meson.build +++ b/omap/meson.build @@ -25,7 +25,7 @@ libdrm_omap = library( c_args : libdrm_c_args, gnu_symbol_visibility : 'hidden', link_with : libdrm, - dependencies : [dep_pthread_stubs, dep_atomic_ops], + dependencies : [dep_threads, dep_atomic_ops], version : '1.0.0', install : true, ) diff --git a/radeon/meson.build b/radeon/meson.build index 4c1c71e0..dda3877a 100644 --- a/radeon/meson.build +++ b/radeon/meson.build @@ -32,7 +32,7 @@ libdrm_radeon = library( gnu_symbol_visibility : 'hidden', include_directories : [inc_root, inc_drm], link_with : libdrm, - dependencies : [dep_pthread_stubs, dep_atomic_ops], + dependencies : [dep_threads, dep_atomic_ops], version : '1.0.1', install : true, ) diff --git a/tegra/meson.build b/tegra/meson.build index 0b63d789..5325ed74 100644 --- a/tegra/meson.build +++ b/tegra/meson.build @@ -28,7 +28,7 @@ libdrm_tegra = library( ], include_directories : [inc_root, inc_drm], link_with : libdrm, - dependencies : [dep_pthread_stubs, dep_atomic_ops], + dependencies : [dep_threads, dep_atomic_ops], c_args : libdrm_c_args, gnu_symbol_visibility : 'hidden', version : '0.0.0',