From cdb235b97f905588b0f6e479777a43d91ffaad5d Mon Sep 17 00:00:00 2001
From: Bruce Cowan <bruce@bcowan.me.uk>
Date: Fri, 14 Feb 2020 09:36:29 +0000
Subject: [PATCH] Revert "Explicitly ask for pthreads"
This reverts commit 8e87228c13357dca9df8175750889b5c72587c9b.
Turns out this doesn't work
---
meson.build | 2 +-
src/meson.build | 4 ++--
src/{pthreads => pthread}/meson.build | 2 +-
src/{pthreads => pthread}/thread-incr.c | 0
4 files changed, 4 insertions(+), 4 deletions(-)
rename src/{pthreads => pthread}/meson.build (73%)
rename src/{pthreads => pthread}/thread-incr.c (100%)
diff --git a/meson.build b/meson.build
index ad35e42..978ed8f 100644
--- a/meson.build
+++ b/meson.build
@@ -10,7 +10,7 @@ libm = cc.find_library('m')
glib_dep = dependency('glib-2.0', version: '>= 2.16', required: false)
openmp_dep = dependency('openmp', required: false)
-pthreads_dep = dependency('pthreads', required: false)
+thread_dep = dependency('threads', required: false)
conf_data = configuration_data()
diff --git a/src/meson.build b/src/meson.build
index 8f29956..10713c1 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -34,6 +34,6 @@ if openmp_dep.found()
subdir('openmp')
endif
-if pthreads_dep.found()
- subdir('pthreads')
+if thread_dep.found()
+ subdir('pthread')
endif
diff --git a/src/pthreads/meson.build b/src/pthread/meson.build
similarity index 73%
rename from src/pthreads/meson.build
rename to src/pthread/meson.build
index 84f361a..d8d7939 100644
--- a/src/pthreads/meson.build
+++ b/src/pthread/meson.build
@@ -3,4 +3,4 @@
# SPDX-License-Identifier: CC0-1.0
executable('thread-incr', 'thread-incr.c',
- dependencies: [pthreads_dep, utils_dep])
+ dependencies: [thread_dep, utils_dep])
diff --git a/src/pthreads/thread-incr.c b/src/pthread/thread-incr.c
similarity index 100%
rename from src/pthreads/thread-incr.c
rename to src/pthread/thread-incr.c
--
GitLab