From 402f7afdb03fa59b28e1c01b490b9673382f1ba4 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 30 Jan 2020 10:06:35 -0800 Subject: [PATCH] dependencies: netcdf always look for netcdf-fortran for fortran Otherwise it tries to link with the C bindings and fails. This is why the test is broken on archlinux --- mesonbuild/dependencies/misc.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 07948c919..04dee0641 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -45,12 +45,12 @@ def netcdf_factory(env: 'Environment', for_machine: 'MachineChoice', candidates = [] # type: T.List['DependencyType'] if DependencyMethods.PKGCONFIG in methods: - pkgconfig_files = ['netcdf'] if language == 'fortran': - pkgconfig_files.append('netcdf-fortran') + pkg = 'netcdf-fortran' + else: + pkg = 'netcdf' - for pkg in pkgconfig_files: - candidates.append(functools.partial(PkgConfigDependency, pkg, env, kwargs, language=language)) + candidates.append(functools.partial(PkgConfigDependency, pkg, env, kwargs, language=language)) if DependencyMethods.CMAKE in methods: candidates.append(functools.partial(CMakeDependency, 'NetCDF', env, kwargs, language=language))