From 7c407ce83731ea8124a521ea9541a43507e32de6 Mon Sep 17 00:00:00 2001 From: Dudemanguy Date: Thu, 23 Feb 2023 10:00:21 -0600 Subject: [PATCH] dependencies: add custom atomic dependency Almost exactly the same as how the dl dependency works. On certain systems (like BSDs that use clang), stdatomic is provided by compiler-rt and doesn't need a separate library explictly linked. On a typical GNU/LINUX system, atomic is a separate library that must be explictly found and linked against. So just add a builtin and system method for these two use cases. --- docs/markdown/Dependencies.md | 10 ++++++++ docs/markdown/snippets/atomic-dependency.md | 9 +++++++ mesonbuild/dependencies/__init__.py | 1 + mesonbuild/dependencies/misc.py | 28 +++++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 docs/markdown/snippets/atomic-dependency.md diff --git a/docs/markdown/Dependencies.md b/docs/markdown/Dependencies.md index d91582523d44..dfa999d82f35 100644 --- a/docs/markdown/Dependencies.md +++ b/docs/markdown/Dependencies.md @@ -317,6 +317,16 @@ dep = dependency('appleframeworks', modules : 'foundation') These dependencies can never be found for non-OSX hosts. +## atomic (stdatomic) + +*(added 1.5.0)* + +Provides access to the atomic operations library. This first attempts +to look for a valid atomic external library before trying to fallback +to what is provided by the libc. + +`method` may be `auto`, `builtin` or `system`. + ## Blocks Enable support for Clang's blocks extension. diff --git a/docs/markdown/snippets/atomic-dependency.md b/docs/markdown/snippets/atomic-dependency.md new file mode 100644 index 000000000000..2eef5e0b1cb0 --- /dev/null +++ b/docs/markdown/snippets/atomic-dependency.md @@ -0,0 +1,9 @@ +## New custom dependency for atomic + +``` +dependency('atomic') +``` + +checks for the availability of the atomic operation library. First, it looks +for the atomic library. If that is not found, then it will try to use what is +provided by the libc. diff --git a/mesonbuild/dependencies/__init__.py b/mesonbuild/dependencies/__init__.py index 89d2285ba3a6..82f8eda48a0b 100644 --- a/mesonbuild/dependencies/__init__.py +++ b/mesonbuild/dependencies/__init__.py @@ -219,6 +219,7 @@ def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T. 'shaderc': 'misc', 'iconv': 'misc', 'intl': 'misc', + 'atomic': 'misc', 'dl': 'misc', 'openssl': 'misc', 'libcrypto': 'misc', diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 72c7cf0a8825..333b4d9f7c45 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -50,6 +50,27 @@ def netcdf_factory(env: 'Environment', packages['netcdf'] = netcdf_factory +class AtomicBuiltinDependency(BuiltinDependency): + def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]): + super().__init__(name, env, kwargs) + self.feature_since = ('1.5.0', "consider checking for `atomic_flag_clear` with and without `find_library('atomic')`") + + if self.clib_compiler.has_function('atomic_flag_clear', '#include ', env)[0]: + self.is_found = True + + +class AtomicSystemDependency(SystemDependency): + def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]): + super().__init__(name, env, kwargs) + self.feature_since = ('1.5.0', "consider checking for `atomic_flag_clear` with and without `find_library('atomic')`") + + h = self.clib_compiler.has_header('stdatomic.h', '', env) + self.link_args = self.clib_compiler.find_library('atomic', env, [], self.libtype) + + if h[0] and self.link_args: + self.is_found = True + + class DlBuiltinDependency(BuiltinDependency): def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]): super().__init__(name, env, kwargs) @@ -559,6 +580,13 @@ def shaderc_factory(env: 'Environment', packages['shaderc'] = shaderc_factory +packages['atomic'] = atomic_factory = DependencyFactory( + 'atomic', + [DependencyMethods.SYSTEM, DependencyMethods.BUILTIN], + system_class=AtomicSystemDependency, + builtin_class=AtomicBuiltinDependency, +) + packages['cups'] = cups_factory = DependencyFactory( 'cups', [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL, DependencyMethods.EXTRAFRAMEWORK, DependencyMethods.CMAKE],