[arch-commits] Commit in python-pytables/trunk (PKGBUILD hdf5_18.patch)

[Ronald van Haren]

    Date: Tuesday, May 24, 2016 @ 13:50:25
  Author: ronald
Revision: 176212

upgpkg: python-pytables 3.2.2-6

build against hdf5_18

Added:
  python-pytables/trunk/hdf5_18.patch
Modified:
  python-pytables/trunk/PKGBUILD

---------------+
 PKGBUILD      |   18 +++++++++++-------
 hdf5_18.patch |   14 ++++++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-24 11:50:04 UTC (rev 176211)
+++ PKGBUILD	2016-05-24 11:50:25 UTC (rev 176212)
@@ -5,15 +5,16 @@
 pkgbase=python-pytables
 pkgname=('python2-pytables' 'python-pytables')
 pkgver=3.2.2
-pkgrel=5
+pkgrel=6
 arch=("i686" "x86_64")
 pkgdesc="A package for managing hierarchical datasets and designed to efficiently and easily cope with extremely large amounts of data"
 url="http://www.pytables.org"
 license=("BSD")
-makedepends=('lzo' 'hdf5' 'python2-numexpr' 'python-numexpr' 'python-setuptools' 'python2-setuptools')
-source=("http://pypi.python.org/packages/source/t/tables/tables-$pkgver.tar.gz")
-md5sums=('4a9792bba1a21f0853e7841d7c1beed8')
-
+makedepends=('lzo' 'hdf5_18' 'python2-numexpr' 'python-numexpr' 'python-setuptools' 'python2-setuptools')
+source=("http://pypi.python.org/packages/source/t/tables/tables-$pkgver.tar.gz"
+        "hdf5_18.patch")
+md5sums=('4a9792bba1a21f0853e7841d7c1beed8'
+         '6cca19b6ce2eb9f84d18888ad2c1a3b4')
 prepare() {
   cd "$srcdir"/tables-$pkgver
 
@@ -23,7 +24,10 @@
   # https://github.com/PyTables/PyTables/pull/503
   sed -i 's/"-march=native",\?//' setup.py
 
-  cd "$srcdir"
+  # force hdf5_18 location
+  patch -Np0 -i "$srcdir"/hdf5_18.patch
+  
+  cd "${srcdir}" 
   cp -a tables-$pkgver tables-py2-$pkgver
 }
 
@@ -30,7 +34,7 @@
 build() {
   msg "Building Python2"
   cd "$srcdir"/tables-py2-$pkgver
-  python2 setup.py build
+  HDF5_DIR=/usr/include/hdf5_18 LD_LIBRARY_PATH=/usr/lib/hdf5_18  python2 setup.py build 
 
   msg "Building Python3"
   cd "$srcdir"/tables-$pkgver

Added: hdf5_18.patch
===================================================================
--- hdf5_18.patch	                        (rev 0)
+++ hdf5_18.patch	2016-05-24 11:50:25 UTC (rev 176212)
@@ -0,0 +1,14 @@
+--- setup.py.old	2016-05-24 13:16:36.129769271 +0200
++++ setup.py	2016-05-24 13:17:07.380243229 +0200
+@@ -552,6 +552,11 @@
+         libdir = compiler.has_function(package.target_function,
+                                        libraries=(package.library_name,))
+ 
++    # force location of hdf5_18
++    if package==hdf5_package:
++        hdrdir = '/usr/include/hdf5_18'
++        libdir = '/usr/lib/hdf5_18'    
++
+     if not (hdrdir and libdir):
+         if package.tag in ['HDF5']:  # these are compulsory!
+             pname, ptag = package.name, package.tag