pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/archivers/py-zstandard py-zstandard: fix build



details:   https://anonhg.NetBSD.org/pkgsrc/rev/47c29fb01e87
branches:  trunk
changeset: 368957:47c29fb01e87
user:      wiedi <wiedi%pkgsrc.org@localhost>
date:      Sat Sep 23 18:25:50 2017 +0000

description:
py-zstandard: fix build

Temporarily remove the zstd buildlink as py-zstandard includes
its own version that it wants to use. Future versions will
support using a system supplied zstd but this one doesn't yet.

Also prevent setup.py from picking up cffi by accident so the
PLIST is stable.

diffstat:

 archivers/py-zstandard/Makefile               |   3 +--
 archivers/py-zstandard/distinfo               |   3 ++-
 archivers/py-zstandard/patches/patch-setup.py |  14 ++++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r 995a4a43e3e4 -r 47c29fb01e87 archivers/py-zstandard/Makefile
--- a/archivers/py-zstandard/Makefile   Sat Sep 23 17:33:12 2017 +0000
+++ b/archivers/py-zstandard/Makefile   Sat Sep 23 18:25:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/03/08 14:54:26 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/23 18:25:50 wiedi Exp $
 
 DISTNAME=      zstandard-0.7.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,6 +10,5 @@
 COMMENT=       Zstandard bindings for Python
 LICENSE=       modified-bsd
 
-.include "../../archivers/zstd/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 995a4a43e3e4 -r 47c29fb01e87 archivers/py-zstandard/distinfo
--- a/archivers/py-zstandard/distinfo   Sat Sep 23 17:33:12 2017 +0000
+++ b/archivers/py-zstandard/distinfo   Sat Sep 23 18:25:50 2017 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2017/03/08 14:54:26 wiz Exp $
+$NetBSD: distinfo,v 1.2 2017/09/23 18:25:50 wiedi Exp $
 
 SHA1 (zstandard-0.7.0.tar.gz) = 36b19fe3b531cb8498869283278ff84bf0ef9a99
 RMD160 (zstandard-0.7.0.tar.gz) = a61b531afb7ffd8d143fa1a51044efe45b2b2427
 SHA512 (zstandard-0.7.0.tar.gz) = 016a8142a504757beb99b681386e7d8ea81b91a3a10b44894fa16443c21b567fce1101283e1967a2895e504045d84173b512fe7144a6a962ef64a509fcd83a4a
 Size (zstandard-0.7.0.tar.gz) = 427288 bytes
+SHA1 (patch-setup.py) = 4655e24415b98dfcf7c3b9978270b8af7530b180
diff -r 995a4a43e3e4 -r 47c29fb01e87 archivers/py-zstandard/patches/patch-setup.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/py-zstandard/patches/patch-setup.py     Sat Sep 23 18:25:50 2017 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-setup.py,v 1.1 2017/09/23 18:25:51 wiedi Exp $
+
+Don't pick up cffi by accident
+--- setup.py.orig      2017-01-28 05:19:11.000000000 +0000
++++ setup.py
+@@ -25,7 +25,7 @@ if "--legacy" in sys.argv:
+ # facilitate reuse in other projects.
+ extensions = [setup_zstd.get_c_extension(SUPPORT_LEGACY, 'zstd')]
+ 
+-if cffi:
++if None:
+     import make_cffi
+     extensions.append(make_cffi.ffi.distutils_extension())
+ 



Home | Main Index | Thread Index | Old Index