summaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/misc.py
diff options
context:
space:
mode:
Diffstat (limited to 'mesonbuild/dependencies/misc.py')
-rw-r--r--mesonbuild/dependencies/misc.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index b1b8b8e13..9c9475574 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -113,9 +113,9 @@ class OpenMPDependency(SystemDependency):
'199810': '1.0',
}
- def __init__(self, environment: 'Environment', kwargs: DependencyObjectKWs) -> None:
+ def __init__(self, name: str, environment: 'Environment', kwargs: DependencyObjectKWs) -> None:
language = kwargs.get('language')
- super().__init__('openmp', environment, kwargs, language=language)
+ super().__init__(name, environment, kwargs, language=language)
self.is_found = False
if self.clib_compiler.get_id() == 'nagfor':
# No macro defined for OpenMP, but OpenMP 3.1 is supported.
@@ -181,8 +181,8 @@ class ThreadDependency(SystemDependency):
class BlocksDependency(SystemDependency):
- def __init__(self, environment: 'Environment', kwargs: DependencyObjectKWs) -> None:
- super().__init__('blocks', environment, kwargs)
+ def __init__(self, name: str, environment: 'Environment', kwargs: DependencyObjectKWs) -> None:
+ super().__init__(name, environment, kwargs)
self.name = 'blocks'
self.is_found = False
@@ -304,8 +304,8 @@ class GpgmeDependencyConfigTool(ConfigToolDependency):
class ShadercDependency(SystemDependency):
- def __init__(self, environment: 'Environment', kwargs: DependencyObjectKWs):
- super().__init__('shaderc', environment, kwargs)
+ def __init__(self, name: str, environment: 'Environment', kwargs: DependencyObjectKWs):
+ super().__init__(name, environment, kwargs)
static_lib = 'shaderc_combined'
shared_lib = 'shaderc_shared'
@@ -508,8 +508,8 @@ class ObjFWDependency(ConfigToolDependency):
tools = ['objfw-config']
tool_name = 'objfw-config'
- def __init__(self, environment: 'Environment', kwargs: DependencyObjectKWs):
- super().__init__('objfw', environment, kwargs)
+ def __init__(self, name: str, environment: 'Environment', kwargs: DependencyObjectKWs):
+ super().__init__(name, environment, kwargs)
self.feature_since = ('1.5.0', '')
if not self.is_found:
return
@@ -586,7 +586,7 @@ def shaderc_factory(env: 'Environment',
candidates.extend(c)
if DependencyMethods.SYSTEM in methods:
- candidates.append(functools.partial(ShadercDependency, env, kwargs))
+ candidates.append(functools.partial(ShadercDependency, 'shaderc', env, kwargs))
return candidates
packages['shaderc'] = shaderc_factory