Add support for Cython>0.24 using an override mechanism in trunk.

3 files changed, 25 insertions, 2 deletions

diff --git a/databases/py-cassandra-driver/Makefile b/databases/py-cassandra-driver/Makefile
index 97bb9a878d7..790288072e5 100644
--- a/databases/py-cassandra-driver/Makefile
+++ b/databases/py-cassandra-driver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2016/11/04 11:00:53 fhajny Exp $
+# $NetBSD: Makefile,v 1.18 2017/02/16 10:43:12 fhajny Exp $
 
 DISTNAME=	python-driver-3.7.1
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}-cassandra/}
@@ -21,6 +21,9 @@ DEPENDS+=	${PYPKGPREFIX}-six>=1.6:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-futures-[0-9]*:../../devel/py-futures
 .endif
 
+# Remove if upstream stops being obsessive about Cython version
+MAKE_ENV+=	CASS_DRIVER_ALLOWED_CYTHON_VERSION=0.*
+
 .include "../../devel/libev/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-cassandra-driver/distinfo b/databases/py-cassandra-driver/distinfo
index dbdc4744cba..14d9a1da373 100644
--- a/databases/py-cassandra-driver/distinfo
+++ b/databases/py-cassandra-driver/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.17 2016/11/04 11:00:53 fhajny Exp $
+$NetBSD: distinfo,v 1.18 2017/02/16 10:43:12 fhajny Exp $
 
 SHA1 (python-driver-3.7.1.tar.gz) = 1bba61b444380082c91fb42f425016ad4135b5b0
 RMD160 (python-driver-3.7.1.tar.gz) = 168e4b6a998c8bd4e730d558cdf536d00e2f2c12
 SHA512 (python-driver-3.7.1.tar.gz) = 66d09bb8d6132bba3dd26186f7d4d834d7f65265101cac96658a997ece1c35346c389f818618580815eecb8cd6dd658f4bf365d6120a14477f9780ff1f682fef
 Size (python-driver-3.7.1.tar.gz) = 513310 bytes
+SHA1 (patch-setup.py) = 26385704ea010efffc210ec805c5a82bdfaf4049
diff --git a/databases/py-cassandra-driver/patches/patch-setup.py b/databases/py-cassandra-driver/patches/patch-setup.py
new file mode 100644
index 00000000000..a867fbe0c7d
--- /dev/null
+++ b/databases/py-cassandra-driver/patches/patch-setup.py
@@ -0,0 +1,19 @@
+$NetBSD: patch-setup.py,v 1.1 2017/02/16 10:43:12 fhajny Exp $
+
+Backport a trunk commit to let us override the Cython version req.
+
+--- setup.py.orig	2016-10-26 15:00:31.000000000 +0000
++++ setup.py
+@@ -388,7 +388,11 @@ def run_setup(extensions):
+         # 1.) build_ext eats errors at compile time, letting the install complete while producing useful feedback
+         # 2.) there could be a case where the python environment has cython installed but the system doesn't have build tools
+         if pre_build_check():
+-            kw['setup_requires'] = ['Cython>=0.20,<0.25']
++            cython_dep = 'Cython>=0.20,<0.25'
++            user_specified_cython_version = os.environ.get('CASS_DRIVER_ALLOWED_CYTHON_VERSION')
++            if user_specified_cython_version is not None:
++                cython_dep = 'Cython==%s' % (user_specified_cython_version,)
++            kw['setup_requires'] = [cython_dep]
+         else:
+             sys.stderr.write("Bypassing Cython setup requirement\n")
+