Fix tdep on py3-test and regen patch

The Makefile doesn't follow Makefile.template order but Landry (being
de facto maintainer as it's in geo ;)) prefers it stays as it is.

ok landry@
This commit is contained in:
danj 2018-10-16 18:06:22 +00:00
parent 856e90a18c
commit 2f595aa598
2 changed files with 7 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2018/10/16 16:51:08 landry Exp $
# $OpenBSD: Makefile,v 1.5 2018/10/16 18:06:22 danj Exp $
COMMENT = high-level API and CLI on top of OGR
@ -36,7 +36,7 @@ RUN_DEPENDS = geo/py-cligj${MODPY_FLAVOR} \
devel/py-six${MODPY_FLAVOR}
TEST_DEPENDS = devel/py-nose${MODPY_FLAVOR} \
devel/py-test
devel/py-test${MODPY_FLAVOR}
WANTLIB += ${COMPILER_LIBCXX} gdal m ${MODPY_WANTLIB}

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-setup_py,v 1.1 2018/10/07 15:30:22 landry Exp $
$OpenBSD: patch-setup_py,v 1.2 2018/10/16 18:06:22 danj Exp $
Index: setup.py
--- setup.py.orig
+++ setup.py
@@ -174,6 +174,14 @@ ext_options = dict(
libraries=libraries,
extra_link_args=extra_link_args)
@@ -181,6 +181,14 @@ ext_options = dict(
extra_link_args=extra_link_args,
)
+ext_options_cpp = dict(
+ include_dirs=include_dirs,
@ -18,7 +18,7 @@ Index: setup.py
# Define the extension modules.
ext_modules = []
@@ -194,7 +202,7 @@ if source_is_repo and "clean" not in sys.argv:
@@ -207,7 +215,7 @@ if source_is_repo and "clean" not in sys.argv:
ext_modules = cythonize([
Extension('fiona._geometry', ['fiona/_geometry.pyx'], **ext_options),