[pytables] 03/05: Link against the dynamic version of the lzo2 library
Antonio Valentino
a_valentino-guest at alioth.debian.org
Sun Sep 1 18:35:51 UTC 2013
This is an automated email from the git hooks/post-receive script.
a_valentino-guest pushed a commit to branch master
in repository pytables.
commit 762edb2f6b23684ceffcd349b62768ac85e61cda
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date: Fri Aug 23 10:39:30 2013 +0000
Link against the dynamic version of the lzo2 library
---
debian/changelog | 9 ++++---
...x-detection-of-platforms-supporting-blosc.patch | 6 +++--
debian/patches/0002-use-dynamic-lib.patch | 28 ++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ec3c1c5..418d3e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,12 @@ pytables (3.0.0-1) UNRELEASED; urgency=low
* Build-Depend on numexpr >= 2.1
* Minimum Python version is now 2.6
* New packages for Python 3
- * Refresh all patches
- * Drop 0002-Fix-detection-od-platforms-supporting-blosc.patch
- (applied upstream)
+ * debian/patches:
+ - Refresh all patches
+ - Drop 0002-Fix-detection-od-platforms-supporting-blosc.patch
+ (applied upstream)
+ - New debian/patches/0002-use-dynamic-lib.patch (fixes an issue with
+ liblzo2.so detection)
* Fixed the license for win32/pthread.* in the copyright file
See also https://code.google.com/p/numexpr/issues/detail?id=109#c5
diff --git a/debian/patches/0001-Fix-detection-of-platforms-supporting-blosc.patch b/debian/patches/0001-Fix-detection-of-platforms-supporting-blosc.patch
index 0c91662..5066c68 100644
--- a/debian/patches/0001-Fix-detection-of-platforms-supporting-blosc.patch
+++ b/debian/patches/0001-Fix-detection-of-platforms-supporting-blosc.patch
@@ -3,12 +3,14 @@ Date: Mon, 24 Jun 2013 18:47:32 +0200
Subject: Fix detection of platforms supporting blosc
---
- tables/utilsExtension.pyx | 2 +-
+ tables/utilsextension.pyx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/tables/utilsextension.pyx b/tables/utilsextension.pyx
+index 33e49f5..09cb79c 100644
--- a/tables/utilsextension.pyx
+++ b/tables/utilsextension.pyx
-@@ -234,7 +234,7 @@
+@@ -234,7 +234,7 @@ def _arch_without_blosc():
for a in ["arm", "sparc", "mips"]:
if a in arch:
return True
diff --git a/debian/patches/0002-use-dynamic-lib.patch b/debian/patches/0002-use-dynamic-lib.patch
new file mode 100644
index 0000000..ece1d30
--- /dev/null
+++ b/debian/patches/0002-use-dynamic-lib.patch
@@ -0,0 +1,28 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Fri, 23 Aug 2013 12:19:58 +0200
+Subject: use dynamic lib
+
+The setup script detects the static version of the lzo2 library instead of
+the dynamic version (that is now located in a multi-arch path).
+This causes a link error due to not relacable code (missing -fPIC flag
+at compile time)
+
+Now the dynamic version of the lzo2 library is located in a multiarch path so
+sthe setup script
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index d966c03..5cd7958 100755
+--- a/setup.py
++++ b/setup.py
+@@ -285,7 +285,7 @@ class Package(object):
+
+ class PosixPackage(Package):
+ _library_prefixes = ['lib']
+- _library_suffixes = ['.so', '.dylib', '.a']
++ _library_suffixes = ['.so', '.dylib'] # , '.a']
+ _runtime_prefixes = _library_prefixes
+ _runtime_suffixes = ['.so', '.dylib']
+ _component_dirs = ['include', 'lib']
diff --git a/debian/patches/series b/debian/patches/series
index 0342713..fac0a91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-Fix-detection-of-platforms-supporting-blosc.patch
+0002-use-dynamic-lib.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytables.git
More information about the debian-science-commits
mailing list