[h5py] 03/17: Package Config: Fix Detection
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Jan 5 19:13:36 UTC 2017
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository h5py.
commit 9ad016f2259285f1844062c46d839697968bf5bd
Author: Axel Huebl <axel.huebl at plasma.ninja>
Date: Wed Jul 13 10:02:15 2016 +0200
Package Config: Fix Detection
Fix the detection of `pkgconfig` to avoid fallbacks to
HDF `1.8.4` or non-detection on default installs on Ubuntu/Debian
based systems.
This is a fixed version of PR #707 by @asford with the feedback
provided by @andreabedini.
The main problem is the mismatch of `list`
[append vs. extend](http://stackoverflow.com/questions/252703/append-vs-extend)
:
`pkgconfig.parse("hdf5")` returns a dictionary of `set`s of which we
take the set of `library_dirs` which should be extending the libdirs
list element-wise (and *not* "adding a `set` object to a list"
via `append`).
---
setup_configure.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup_configure.py b/setup_configure.py
index fc7fb08..c670ff1 100644
--- a/setup_configure.py
+++ b/setup_configure.py
@@ -204,7 +204,7 @@ def autodetect_version(hdf5_dir=None):
libdirs = ['/usr/local/lib', '/opt/local/lib']
try:
if pkgconfig.exists("hdf5"):
- libdirs.append(pkgconfig.parse("hdf5")['library_dirs'])
+ libdirs.extend(pkgconfig.parse("hdf5")['library_dirs'])
except EnvironmentError:
pass
if hdf5_dir is not None:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/h5py.git
More information about the debian-science-commits
mailing list