diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/compilers/fortran.py | 4 | ||||
| -rw-r--r-- | mesonbuild/dependencies/base.py | 1 | ||||
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 24 | ||||
| -rw-r--r-- | mesonbuild/dependencies/platform.py | 2 |
4 files changed, 15 insertions, 16 deletions
diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py index a8e8e25..eea1660 100644 --- a/mesonbuild/compilers/fortran.py +++ b/mesonbuild/compilers/fortran.py @@ -267,8 +267,8 @@ class FortranCompiler(Compiler): return CCompiler._get_trials_from_pattern(pattern, directory, libname) @staticmethod - def _get_file_from_list(files) -> List[str]: - return CCompiler._get_file_from_list(files) + def _get_file_from_list(env, files: List[str]) -> str: + return CCompiler._get_file_from_list(env, files) class GnuFortranCompiler(GnuCompiler, FortranCompiler): def __init__(self, exelist, version, compiler_type, is_cross, exe_wrapper=None, defines=None, **kwargs): diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 586c716..9da0d7c 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -19,7 +19,6 @@ import copy import functools import os import re -import stat import json import shlex import shutil diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index fb2b9db..208f063 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -52,23 +52,25 @@ class HDF5Dependency(ExternalDependency): if pkgdep.found(): self.compile_args = pkgdep.get_compile_args() # derive needed libraries by language - link_args = pkgdep.get_link_args() - lang_link_args = [] - for larg in link_args: + pd_link_args = pkgdep.get_link_args() + link_args = [] + for larg in pd_link_args: lpath = Path(larg) if lpath.is_file(): if language == 'cpp': - lang_link_args.append(str(lpath.parent / (lpath.stem + '_hl_cpp' + lpath.suffix))) - lang_link_args.append(str(lpath.parent / (lpath.stem + '_cpp' + lpath.suffix))) + link_args.append(str(lpath.parent / (lpath.stem + '_hl_cpp' + lpath.suffix))) + link_args.append(str(lpath.parent / (lpath.stem + '_cpp' + lpath.suffix))) elif language == 'fortran': - lang_link_args.append(str(lpath.parent / (lpath.stem + 'hl_fortran' + lpath.suffix))) - lang_link_args.append(str(lpath.parent / (lpath.stem + '_fortran' + lpath.suffix))) + link_args.append(str(lpath.parent / (lpath.stem + 'hl_fortran' + lpath.suffix))) + link_args.append(str(lpath.parent / (lpath.stem + '_fortran' + lpath.suffix))) - # C is used by other languages - lang_link_args.append(str(lpath.parent / (lpath.stem + '_hl' + lpath.suffix))) - lang_link_args.append(larg) + # HDF5 C libs are required by other HDF5 languages + link_args.append(str(lpath.parent / (lpath.stem + '_hl' + lpath.suffix))) + link_args.append(larg) + else: + link_args.append(larg) - self.link_args = lang_link_args + self.link_args = link_args self.version = pkgdep.get_version() self.is_found = True self.pcdep = pkgdep diff --git a/mesonbuild/dependencies/platform.py b/mesonbuild/dependencies/platform.py index 20d3bd6..7e9f9d8 100644 --- a/mesonbuild/dependencies/platform.py +++ b/mesonbuild/dependencies/platform.py @@ -15,8 +15,6 @@ # This file contains the detection logic for external dependencies that are # platform-specific (generally speaking). -from .. import mesonlib - from .base import ExternalDependency, DependencyException |