diff options
| -rw-r--r-- | .pylintrc | 7 | ||||
| -rw-r--r-- | mesonbuild/dependencies/scalapack.py | 8 | ||||
| -rw-r--r-- | mesonbuild/minstall.py | 2 |
3 files changed, 11 insertions, 6 deletions
@@ -8,8 +8,13 @@ score=no disable=all enable= assert-on-tuple, + compare-to-zero, dangerous-default-value, deprecated-lambda, - compare-to-zero, len-as-condition, + missing-kwoa, + no-value-for-parameter, + redundant-keyword-arg, + too-many-function-args, + unexpected-keyword-arg, unreachable diff --git a/mesonbuild/dependencies/scalapack.py b/mesonbuild/dependencies/scalapack.py index 8774746..0147e0b 100644 --- a/mesonbuild/dependencies/scalapack.py +++ b/mesonbuild/dependencies/scalapack.py @@ -109,10 +109,10 @@ class MKLPkgConfigDependency(PkgConfigDependency): if self.clib_compiler.id == 'gcc': for i, a in enumerate(self.link_args): # only replace in filename, not in directory names - parts = list(os.path.split(a)) - if 'mkl_intel_lp64' in parts[-1]: - parts[-1] = parts[-1].replace('intel', 'gf') - self.link_args[i] = '/' + os.path.join(*parts) + dirname, basename = os.path.split(a) + if 'mkl_intel_lp64' in basename: + basename = basename.replace('intel', 'gf') + self.link_args[i] = '/' + os.path.join(dirname, basename) # MKL pkg-config omits scalapack # be sure "-L" and "-Wl" are first if present i = 0 diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py index 7a56275..0eaa54f 100644 --- a/mesonbuild/minstall.py +++ b/mesonbuild/minstall.py @@ -483,7 +483,7 @@ class Installer: set_mode(outname, install_mode, d.install_umask) if should_strip and d.strip_bin is not None: if fname.endswith('.jar'): - self.log('Not stripping jar target:', os.path.basename(fname)) + self.log('Not stripping jar target: {}'.format(os.path.basename(fname))) continue self.log('Stripping target {!r} using {}.'.format(fname, d.strip_bin[0])) ps, stdo, stde = Popen_safe(d.strip_bin + [outname]) |