aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mesonbuild/dependencies/boost.py5
-rw-r--r--mesonbuild/dependencies/coarrays.py5
-rw-r--r--mesonbuild/dependencies/cuda.py7
-rw-r--r--mesonbuild/dependencies/dev.py17
-rw-r--r--mesonbuild/dependencies/misc.py20
-rw-r--r--mesonbuild/dependencies/mpi.py9
-rw-r--r--mesonbuild/dependencies/ui.py6
-rw-r--r--mesonbuild/modules/python.py8
-rw-r--r--test cases/failing/68 wrong boost module/test.json2
9 files changed, 41 insertions, 38 deletions
diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py
index c8bc594..fabebfa 100644
--- a/mesonbuild/dependencies/boost.py
+++ b/mesonbuild/dependencies/boost.py
@@ -21,9 +21,10 @@ from .. import mlog
from .. import mesonlib
from ..environment import Environment
-from .base import DependencyException, ExternalDependency
+from .base import DependencyException
from .pkgconfig import PkgConfigDependency
from .misc import threads_factory
+from .system import SystemDependency
if T.TYPE_CHECKING:
from ..environment import Properties
@@ -340,7 +341,7 @@ class BoostLibraryFile():
def get_link_args(self) -> T.List[str]:
return [self.path.as_posix()]
-class BoostDependency(ExternalDependency):
+class BoostDependency(SystemDependency):
def __init__(self, environment: Environment, kwargs: T.Dict[str, T.Any]) -> None:
super().__init__('boost', environment, kwargs, language='cpp')
buildtype = environment.coredata.get_option(mesonlib.OptionKey('buildtype'))
diff --git a/mesonbuild/dependencies/coarrays.py b/mesonbuild/dependencies/coarrays.py
index aa8c818..f2aa608 100644
--- a/mesonbuild/dependencies/coarrays.py
+++ b/mesonbuild/dependencies/coarrays.py
@@ -15,10 +15,11 @@
import functools
import typing as T
-from .base import DependencyMethods, ExternalDependency, detect_compiler
+from .base import DependencyMethods, detect_compiler
from .cmake import CMakeDependency
from .pkgconfig import PkgConfigDependency
from .factory import factory_methods
+from .system import SystemDependency
if T.TYPE_CHECKING:
from . factory import DependencyGenerator
@@ -52,7 +53,7 @@ def coarray_factory(env: 'Environment',
return candidates
-class CoarrayDependency(ExternalDependency):
+class CoarrayDependency(SystemDependency):
"""
Coarrays are a Fortran 2008 feature.
diff --git a/mesonbuild/dependencies/cuda.py b/mesonbuild/dependencies/cuda.py
index 42fdb09..d396dbe 100644
--- a/mesonbuild/dependencies/cuda.py
+++ b/mesonbuild/dependencies/cuda.py
@@ -18,11 +18,12 @@ import os
import typing as T
from pathlib import Path
-from .. import mlog
from .. import mesonlib
+from .. import mlog
from ..environment import detect_cpu_family
+from .base import DependencyException
+from .system import SystemDependency
-from .base import (DependencyException, ExternalDependency)
if T.TYPE_CHECKING:
from ..environment import Environment
@@ -30,7 +31,7 @@ if T.TYPE_CHECKING:
TV_ResultTuple = T.Tuple[T.Optional[str], T.Optional[str], bool]
-class CudaDependency(ExternalDependency):
+class CudaDependency(SystemDependency):
supported_languages = ['cuda', 'cpp', 'c'] # see also _default_language
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py
index 397ad0c..ab9e9e5 100644
--- a/mesonbuild/dependencies/dev.py
+++ b/mesonbuild/dependencies/dev.py
@@ -23,15 +23,16 @@ import shutil
import typing as T
from .. import mesonlib, mlog
-from ..mesonlib import version_compare, stringlistify, extract_as_list, MachineChoice
+from ..compilers import AppleClangCCompiler, AppleClangCPPCompiler
from ..environment import get_llvm_tool_names
-from .base import DependencyException, DependencyMethods, ExternalDependency, strip_system_libdirs
+from ..mesonlib import version_compare, stringlistify, extract_as_list, MachineChoice
+from .base import DependencyException, DependencyMethods, strip_system_libdirs
from .cmake import CMakeDependency
from .configtool import ConfigToolDependency
-from .pkgconfig import PkgConfigDependency
from .factory import DependencyFactory
from .misc import threads_factory
-from ..compilers import AppleClangCCompiler, AppleClangCPPCompiler
+from .pkgconfig import PkgConfigDependency
+from .system import SystemDependency
if T.TYPE_CHECKING:
from ..envconfig import MachineInfo
@@ -50,7 +51,7 @@ def get_shared_library_suffix(environment: 'Environment', for_machine: MachineCh
return '.so'
-class GTestDependencySystem(ExternalDependency):
+class GTestDependencySystem(SystemDependency):
def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.Any]) -> None:
super().__init__(name, environment, kwargs, language='cpp')
self.main = kwargs.get('main', False)
@@ -120,7 +121,7 @@ class GTestDependencyPC(PkgConfigDependency):
super().__init__(name, environment, kwargs)
-class GMockDependencySystem(ExternalDependency):
+class GMockDependencySystem(SystemDependency):
def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.Any]) -> None:
super().__init__(name, environment, kwargs, language='cpp')
self.main = kwargs.get('main', False)
@@ -464,7 +465,7 @@ class ValgrindDependency(PkgConfigDependency):
return []
-class ZlibSystemDependency(ExternalDependency):
+class ZlibSystemDependency(SystemDependency):
def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.Any]):
super().__init__(name, environment, kwargs)
@@ -513,7 +514,7 @@ class ZlibSystemDependency(ExternalDependency):
return [DependencyMethods.SYSTEM]
-class JDKSystemDependency(ExternalDependency):
+class JDKSystemDependency(SystemDependency):
def __init__(self, environment: 'Environment', kwargs: T.Dict[str, T.Any]):
super().__init__('jdk', environment, kwargs)
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index 1dadb51..eb712b1 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -20,15 +20,15 @@ import re
import sysconfig
import typing as T
-from .. import mlog
from .. import mesonlib
+from .. import mlog
from ..environment import detect_cpu_family
-
-from .base import DependencyException, DependencyMethods, ExternalDependency
+from .base import DependencyException, DependencyMethods
from .cmake import CMakeDependency
from .configtool import ConfigToolDependency
-from .pkgconfig import PkgConfigDependency
from .factory import DependencyFactory, factory_methods
+from .pkgconfig import PkgConfigDependency
+from .system import SystemDependency
if T.TYPE_CHECKING:
from ..environment import Environment, MachineChoice
@@ -60,7 +60,7 @@ def netcdf_factory(env: 'Environment',
return candidates
-class OpenMPDependency(ExternalDependency):
+class OpenMPDependency(SystemDependency):
# Map date of specification release (which is the macro value) to a version.
VERSIONS = {
'201811': '5.0',
@@ -112,7 +112,7 @@ class OpenMPDependency(ExternalDependency):
mlog.log(mlog.yellow('WARNING:'), 'OpenMP found but omp.h missing.')
-class ThreadDependency(ExternalDependency):
+class ThreadDependency(SystemDependency):
def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.Any]) -> None:
super().__init__(name, environment, kwargs)
self.is_found = True
@@ -130,7 +130,7 @@ class ThreadDependency(ExternalDependency):
return [DependencyMethods.AUTO, DependencyMethods.CMAKE]
-class BlocksDependency(ExternalDependency):
+class BlocksDependency(SystemDependency):
def __init__(self, environment: 'Environment', kwargs: T.Dict[str, T.Any]) -> None:
super().__init__('blocks', environment, kwargs)
self.name = 'blocks'
@@ -163,7 +163,7 @@ class BlocksDependency(ExternalDependency):
self.is_found = True
-class Python3DependencySystem(ExternalDependency):
+class Python3DependencySystem(SystemDependency):
def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.Any]) -> None:
super().__init__(name, environment, kwargs)
@@ -379,7 +379,7 @@ class GpgmeDependencyConfigTool(ConfigToolDependency):
return [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL]
-class ShadercDependency(ExternalDependency):
+class ShadercDependency(SystemDependency):
def __init__(self, environment: 'Environment', kwargs: T.Dict[str, T.Any]):
super().__init__('shaderc', environment, kwargs)
@@ -428,7 +428,7 @@ class CursesConfigToolDependency(ConfigToolDependency):
self.link_args = self.get_config_value(['--libs'], 'link_args')
-class CursesSystemDependency(ExternalDependency):
+class CursesSystemDependency(SystemDependency):
"""Curses dependency the hard way.
diff --git a/mesonbuild/dependencies/mpi.py b/mesonbuild/dependencies/mpi.py
index f0533b5..8985b79 100644
--- a/mesonbuild/dependencies/mpi.py
+++ b/mesonbuild/dependencies/mpi.py
@@ -17,11 +17,12 @@ import typing as T
import os
import re
-from .base import DependencyMethods, detect_compiler, ExternalDependency
+from ..environment import detect_cpu_family
+from .base import DependencyMethods, detect_compiler
from .configtool import ConfigToolDependency
-from .pkgconfig import PkgConfigDependency
from .factory import factory_methods
-from ..environment import detect_cpu_family
+from .pkgconfig import PkgConfigDependency
+from .system import SystemDependency
if T.TYPE_CHECKING:
from .factory import DependencyGenerator
@@ -200,7 +201,7 @@ class OpenMPIConfigToolDependency(_MPIConfigToolDependency):
return out
-class MSMPIDependency(ExternalDependency):
+class MSMPIDependency(SystemDependency):
"""The Microsoft MPI."""
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
index 4eefd6e..53ae589 100644
--- a/mesonbuild/dependencies/ui.py
+++ b/mesonbuild/dependencies/ui.py
@@ -26,15 +26,15 @@ from ..mesonlib import (
from ..environment import detect_cpu_family
from .base import DependencyException, DependencyMethods
-from .base import ExternalDependency
from .configtool import ConfigToolDependency
from .factory import DependencyFactory
+from .system import SystemDependency
if T.TYPE_CHECKING:
from ..environment import Environment
-class GLDependencySystem(ExternalDependency):
+class GLDependencySystem(SystemDependency):
def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.Any]) -> None:
super().__init__(name, environment, kwargs)
@@ -196,7 +196,7 @@ class WxDependency(ConfigToolDependency):
return candidates
-class VulkanDependencySystem(ExternalDependency):
+class VulkanDependencySystem(SystemDependency):
def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.Any], language: T.Optional[str] = None) -> None:
super().__init__(name, environment, kwargs, language=language)
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
index 0e3df9b..94e100b 100644
--- a/mesonbuild/modules/python.py
+++ b/mesonbuild/modules/python.py
@@ -30,17 +30,15 @@ from ..interpreter import ExternalProgramHolder, extract_required_kwarg, permitt
from ..build import known_shmod_kwargs
from .. import mlog
from ..environment import detect_cpu_family
-from ..dependencies import (
- DependencyMethods, ExternalDependency,
- PkgConfigDependency, NotFoundDependency
-)
+from ..dependencies import DependencyMethods, PkgConfigDependency, NotFoundDependency
+from ..dependencies.system import SystemDependency
from ..programs import ExternalProgram, NonExistingExternalProgram
mod_kwargs = {'subdir'}
mod_kwargs.update(known_shmod_kwargs)
mod_kwargs -= {'name_prefix', 'name_suffix'}
-class PythonDependency(ExternalDependency):
+class PythonDependency(SystemDependency):
def __init__(self, python_holder, environment, kwargs):
super().__init__('python', environment, kwargs)
diff --git a/test cases/failing/68 wrong boost module/test.json b/test cases/failing/68 wrong boost module/test.json
index 9ef1b0f..9edd452 100644
--- a/test cases/failing/68 wrong boost module/test.json
+++ b/test cases/failing/68 wrong boost module/test.json
@@ -1,7 +1,7 @@
{
"stdout": [
{
- "line": "test cases/failing/68 wrong boost module/meson.build:9:0: ERROR: Dependency \"boost\" not found"
+ "line": "test cases/failing/68 wrong boost module/meson.build:9:0: ERROR: Dependency \"boost\" not found, tried system"
}
]
}
generated by cgit v1.1 at 2025-03-31 12:24:06 +0000