From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Wed, 16 Aug 2023 09:17:15 +0000 (+0200)
Subject: Meson: More cleanups to the atomics module
X-Git-Tag: rec-5.1.0-alpha1~80^2~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc6f77286a556b5a7537770fec9837dcf1330122;p=thirdparty%2Fpdns.git

Meson: More cleanups to the atomics module
---

diff --git a/meson.build b/meson.build
index fc7d96726d..d45ba24933 100644
--- a/meson.build
+++ b/meson.build
@@ -184,7 +184,7 @@ subdir('ext')
 deps = [
   dep_pdns,
   dep_platform,
-  dep_atomic,
+  dep_atomics,
   dep_lua,
   dep_lua_records,
   dep_gss_tsig,
diff --git a/meson/atomics/meson.build b/meson/atomics/meson.build
index 6a4138b8c2..47bf92ef88 100644
--- a/meson/atomics/meson.build
+++ b/meson/atomics/meson.build
@@ -1,4 +1,4 @@
-dep_atomic = declare_dependency()
+dep_atomics = dependency('', required: false)
 need_latomic = false
 
 prog = fs.read('atomic_add_fetch.cc')
@@ -7,7 +7,7 @@ if not cxx.links(prog, name: '-latomic is not needed for using __atomic builtins
   if lib_atomic.found()
     if cxx.links(prog, name: '-latomic is needed for using __atomic builtins', dependencies: lib_atomic)
       need_latomic = true
-      dep_atomic = declare_dependency(dependencies: lib_atomic)
+      dep_atomics = declare_dependency(dependencies: lib_atomic)
       summary('Atomics Library', lib_atomic, section: 'System')
     else
       error('libatomic is needed and was found, but linking with it failed')
@@ -15,6 +15,8 @@ if not cxx.links(prog, name: '-latomic is not needed for using __atomic builtins
   else
     error('libatomic is needed but could not be found')
   endif
+else
+  dep_atomics = declare_dependency()
 endif
 
-summary('Need -latomic', need_latomic, section: 'System')
+summary('Need -latomic', need_latomic, bool_yn: true, section: 'System')