From 8198888bc41b3aeff445b730556a701024eabdf2 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 27 Jun 2024 12:57:32 -0400
Subject: [PATCH] More dedup

---
 meson-utils/threads/meson.build | 6 ++++++
 src/libexpr/meson.build         | 7 +------
 src/libstore/meson.build        | 7 +------
 src/libutil/meson.build         | 7 +------
 4 files changed, 9 insertions(+), 18 deletions(-)
 create mode 100644 meson-utils/threads/meson.build

diff --git a/meson-utils/threads/meson.build b/meson-utils/threads/meson.build
new file mode 100644
index 000000000..294160de1
--- /dev/null
+++ b/meson-utils/threads/meson.build
@@ -0,0 +1,6 @@
+# This is only conditional to work around
+# https://github.com/mesonbuild/meson/issues/13293. It should be
+# unconditional.
+if not (host_machine.system() == 'windows' and cxx.get_id() == 'gcc')
+  deps_private += dependency('threads')
+endif
diff --git a/src/libexpr/meson.build b/src/libexpr/meson.build
index 30981a66e..8d37947b1 100644
--- a/src/libexpr/meson.build
+++ b/src/libexpr/meson.build
@@ -27,12 +27,7 @@ deps_public_maybe_subproject = [
 ]
 subdir('meson-utils/subprojects')
 
-# This is only conditional to work around
-# https://github.com/mesonbuild/meson/issues/13293. It should be
-# unconditional.
-if not (host_machine.system() == 'windows' and cxx.get_id() == 'gcc')
-  deps_private += dependency('threads')
-endif
+subdir('meson-utils/threads')
 
 boost = dependency(
   'boost',
diff --git a/src/libstore/meson.build b/src/libstore/meson.build
index a552fc819..8ec12e42f 100644
--- a/src/libstore/meson.build
+++ b/src/libstore/meson.build
@@ -67,12 +67,7 @@ has_acl_support = cxx.has_header('sys/xattr.h') \
   and cxx.has_function('lremovexattr')
 configdata.set('HAVE_ACL_SUPPORT', has_acl_support.to_int())
 
-# This is only conditional to work around
-# https://github.com/mesonbuild/meson/issues/13293. It should be
-# unconditional.
-if not (host_machine.system() == 'windows' and cxx.get_id() == 'gcc')
-  deps_private += dependency('threads')
-endif
+subdir('meson-utils/threads')
 
 boost = dependency(
   'boost',
diff --git a/src/libutil/meson.build b/src/libutil/meson.build
index 84e47b4b4..317b06da0 100644
--- a/src/libutil/meson.build
+++ b/src/libutil/meson.build
@@ -48,12 +48,7 @@ foreach funcspec : check_funcs
   configdata.set(define_name, define_value)
 endforeach
 
-# This is only conditional to work around
-# https://github.com/mesonbuild/meson/issues/13293. It should be
-# unconditional.
-if not (host_machine.system() == 'windows' and cxx.get_id() == 'gcc')
-  deps_private += dependency('threads')
-endif
+subdir('meson-utils/threads')
 
 if host_machine.system() == 'windows'
   socket = cxx.find_library('ws2_32')