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

[Andrzej Giniewicz]

    Date: Sunday, May 14, 2017 @ 16:42:49
  Author: aginiewicz
Revision: 228019

upgpkg: python-pytables 3.4.2-1

python-pytables: new upstream release

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

---------------+
 PKGBUILD      |   29 +++++++++--------------------
 hdf5_18.patch |   14 --------------
 2 files changed, 9 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-14 16:41:54 UTC (rev 228018)
+++ PKGBUILD	2017-05-14 16:42:49 UTC (rev 228019)
@@ -4,30 +4,19 @@
 
 pkgbase=python-pytables
 pkgname=('python2-pytables' 'python-pytables')
-pkgver=3.3.0
-pkgrel=3
+pkgver=3.4.2
+pkgrel=1
 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_18' 'python2-numexpr' 'python-numexpr' 'python-setuptools' 'python2-setuptools' 'cython' 'cython2' 'blosc' 'bzip2' 'lzo')
-source=("https://github.com/PyTables/PyTables/archive/v${pkgver}.tar.gz"
-        "hdf5_18.patch")
-md5sums=('056c161ae0fd2d6e585b766adacf3b0b'
-         '6cca19b6ce2eb9f84d18888ad2c1a3b4')
+makedepends=('lzo' 'hdf5' 'python2-numexpr' 'python-numexpr' 'python-setuptools' 'python2-setuptools' 'cython' 'cython2' 'blosc' 'bzip2')
+source=("https://github.com/PyTables/PyTables/archive/v${pkgver}.tar.gz")
+md5sums=('a14bc216fa323562a35029183c0ffda9')
 
 prepare() {
   cd "$srcdir"/PyTables-$pkgver
 
-  # -march=native generates AVX instructions if the host supports it, which
-  # then results in "SIGILL (Illegal instruction)" on machines lacking AVX
-  # https://github.com/PyTables/PyTables/issues/458
-  # https://github.com/PyTables/PyTables/pull/503
-  sed -i 's/"-march=native",\?//' setup.py
-
-  # force hdf5_18 location
-  patch -Np0 -i "$srcdir"/hdf5_18.patch
-  
   cd "${srcdir}" 
   cp -a PyTables-$pkgver PyTables-py2-$pkgver
 }
@@ -35,15 +24,15 @@
 build() {
   msg "Building Python2"
   cd "$srcdir"/PyTables-py2-$pkgver
-  HDF5_DIR=/usr/include/hdf5_18 LD_LIBRARY_PATH=/usr/lib/hdf5_18 python2 setup.py build --blosc=/usr
+  python2 setup.py build --blosc=/usr
 
   msg "Building Python3"
   cd "$srcdir"/PyTables-$pkgver
-  HDF5_DIR=/usr/include/hdf5_18 LD_LIBRARY_PATH=/usr/lib/hdf5_18 python setup.py build --blosc=/usr
+  python setup.py build --blosc=/usr
 }
 
 package_python2-pytables() {
-  depends=('lzo' 'hdf5_18' 'python2-numexpr' 'blosc')
+  depends=('lzo' 'hdf5' 'python2-numexpr' 'blosc')
 
   cd "$srcdir"/PyTables-py2-${pkgver}
   python2 setup.py install --skip-build --prefix=/usr --root="$pkgdir" --optimize=1
@@ -63,7 +52,7 @@
 }
 
 package_python-pytables() {
-  depends=('lzo' 'hdf5_18' 'python-numexpr' 'blosc')
+  depends=('lzo' 'hdf5' 'python-numexpr' 'blosc')
 
   cd "$srcdir"/PyTables-${pkgver}
   python setup.py install --skip-build --prefix=/usr --root="$pkgdir" --optimize=1

Deleted: hdf5_18.patch
===================================================================
--- hdf5_18.patch	2017-05-14 16:41:54 UTC (rev 228018)
+++ hdf5_18.patch	2017-05-14 16:42:49 UTC (rev 228019)
@@ -1,14 +0,0 @@
---- 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