projects
/
pytables.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
394bc71
)
Fix LZO2 detection
author
Antonio Valentino
<antonio.valentino@tiscali.it>
Tue, 1 Jan 2019 18:20:33 +0000
(18:20 +0000)
committer
Antonio Valentino
<antonio.valentino@tiscali.it>
Wed, 2 Jan 2019 09:48:48 +0000
(09:48 +0000)
Gbp-Pq: Name 0006-Fix-LZO2-detection.patch
setup.py
patch
|
blob
|
history
diff --git
a/setup.py
b/setup.py
index 46974b861d6325d68159f274a92d094159b271b5..e5fa4209aebf8fcc204e2a66e53779a16414a0fb 100755
(executable)
--- a/
setup.py
+++ b/
setup.py
@@
-606,8
+606,11
@@
for (package, location) in [(hdf5_package, HDF5_DIR),
if not location and CONDA_PREFIX:
location = CONDA_PREFIX
+ # looking for lzo/lzo1x.h but pkgconfig already returns '/usr/include/lzo'
+ use_pkgconfig = USE_PKGCONFIG if package.tag != 'LZO2' else False
+
(hdrdir, libdir, rundir) = package.find_directories(
- location, use_pkgconfig=
USE_PKGCONFIG
)
+ location, use_pkgconfig=
use_pkgconfig
)
# check if HDF5 library uses old DLL naming scheme
if hdrdir and package.tag == 'HDF5':