diff options
author | wiz <wiz> | 2016-08-18 20:30:02 +0000 |
---|---|---|
committer | wiz <wiz> | 2016-08-18 20:30:02 +0000 |
commit | 03a41b88737af9cef60485511e1cc8f5c79b9b0b (patch) | |
tree | 497d4d167055ebcd9659a5a6cb88fc048e3f7e21 /math | |
parent | 603e4aa17e899e03ccf075bde5794eacafffe8e8 (diff) | |
download | pkgsrc-03a41b88737af9cef60485511e1cc8f5c79b9b0b.tar.gz |
Add a patch to fix build with python-3.x where cpuinfo does not seem
to provide flags.
Fix parallel installation of different python-versions of this package.
Bump PKGREVISION.
Diffstat (limited to 'math')
-rw-r--r-- | math/py-pytables/Makefile | 6 | ||||
-rw-r--r-- | math/py-pytables/PLIST | 4 | ||||
-rw-r--r-- | math/py-pytables/distinfo | 3 | ||||
-rw-r--r-- | math/py-pytables/patches/patch-setup.py | 28 |
4 files changed, 36 insertions, 5 deletions
diff --git a/math/py-pytables/Makefile b/math/py-pytables/Makefile index 0b2d3f320b7..6c7006afd69 100644 --- a/math/py-pytables/Makefile +++ b/math/py-pytables/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.33 2016/08/16 02:42:48 maya Exp $ +# $NetBSD: Makefile,v 1.34 2016/08/18 20:30:02 wiz Exp $ DISTNAME= tables-3.2.3 PKGNAME= ${PYPKGPREFIX}-py${DISTNAME} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_GITHUB:=PyTables/} GITHUB_PROJECT= PyTables @@ -28,7 +29,8 @@ post-install: cd ${DESTDIR}${PREFIX}/bin && \ mv pt2to3 pt2to3${PYVERSSUFFIX} && \ mv ptdump ptdump${PYVERSSUFFIX} && \ - mv ptrepack ptrepack${PYVERSSUFFIX} + mv ptrepack ptrepack${PYVERSSUFFIX} && \ + mv pttree pttree${PYVERSSUFFIX} do-test: (cd ${WRKSRC}/tables/tests && ${PYTHONBIN} test_all.py) diff --git a/math/py-pytables/PLIST b/math/py-pytables/PLIST index 824b80f1c87..84a79a5fd15 100644 --- a/math/py-pytables/PLIST +++ b/math/py-pytables/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.13 2016/08/16 14:12:35 maya Exp $ +@comment $NetBSD: PLIST,v 1.14 2016/08/18 20:30:02 wiz Exp $ bin/pt2to3${PYVERSSUFFIX} bin/ptdump${PYVERSSUFFIX} bin/ptrepack${PYVERSSUFFIX} -bin/pttree +bin/pttree${PYVERSSUFFIX} ${PYSITELIB}/${EGG_FILE}/PKG-INFO ${PYSITELIB}/${EGG_FILE}/SOURCES.txt ${PYSITELIB}/${EGG_FILE}/dependency_links.txt diff --git a/math/py-pytables/distinfo b/math/py-pytables/distinfo index 9bbf1ea8453..9407955672e 100644 --- a/math/py-pytables/distinfo +++ b/math/py-pytables/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.14 2016/08/16 02:42:48 maya Exp $ +$NetBSD: distinfo,v 1.15 2016/08/18 20:30:02 wiz Exp $ SHA1 (tables-3.2.3.tar.gz) = d7a2965821f436aabcf97e2851fe857c40e71cca RMD160 (tables-3.2.3.tar.gz) = b0eaa61390a65d4e23f0499ca64409c20fd23bae SHA512 (tables-3.2.3.tar.gz) = 565ae648a81daa6e9eb7d8dfbecef4f0b195122dd2c60a99f89f903f7366515997c302e649441f68b20c13b0f7ccff1e97971cc16b4bd56b579a069d92247e9a Size (tables-3.2.3.tar.gz) = 3821258 bytes SHA1 (patch-c-blosc_blosc_blosc.c) = 53751c1242e9d2e3057bb1eef0f075f2fdd97c3f +SHA1 (patch-setup.py) = 51e92744674fbc8b64e3dc150fcf9927efebc821 diff --git a/math/py-pytables/patches/patch-setup.py b/math/py-pytables/patches/patch-setup.py new file mode 100644 index 00000000000..03702b9f8ec --- /dev/null +++ b/math/py-pytables/patches/patch-setup.py @@ -0,0 +1,28 @@ +$NetBSD: patch-setup.py,v 1.3 2016/08/18 20:30:02 wiz Exp $ + +--- setup.py.orig 2016-07-03 11:46:48.000000000 +0000 ++++ setup.py +@@ -793,23 +793,6 @@ if 'BLOSC' not in optional_libs: + finally: + os.remove(fd.name) + +- # Detection code for SSE2/AVX2 only works for gcc/clang, not for MSVC yet +- # SSE2 +- if ('sse2' in cpu_info['flags'] and +- compiler_has_flags(compiler, ["-msse2"])): +- print('SSE2 detected') +- CFLAGS.append('-DSHUFFLE_SSE2_ENABLED') +- CFLAGS.append('-msse2') +- blosc_sources += [f for f in glob.glob('c-blosc/blosc/*.c') +- if 'sse2' in f] +- # AVX2 +- if ('avx2' in cpu_info['flags'] and +- compiler_has_flags(compiler, ["-mavx2"])): +- print('AVX2 detected') +- CFLAGS.append('-DSHUFFLE_AVX2_ENABLED') +- CFLAGS.append('-mavx2') +- blosc_sources += [f for f in glob.glob('c-blosc/blosc/*.c') +- if 'avx2' in f] + else: + ADDLIBS += ['blosc'] + |