diff options
| author | adam <adam@pkgsrc.org> | 2019-09-28 08:42:07 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2019-09-28 08:42:07 +0000 |
| commit | 722f91d183fdda603854bdd03ed10341cf12f641 (patch) | |
| tree | b99d5d3c6f320ce937aca756148905e483c988af /databases | |
| parent | 3e23a9f797c52c39e3cef980c71522096cde37ca (diff) | |
| download | pkgsrc-722f91d183fdda603854bdd03ed10341cf12f641.tar.gz | |
py-sqlrelay: fix buidling when multiple Python versions are installed
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/py-sqlrelay/Makefile | 9 | ||||
| -rw-r--r-- | databases/sqlrelay/distinfo | 4 | ||||
| -rw-r--r-- | databases/sqlrelay/patches/patch-configure | 9 |
3 files changed, 14 insertions, 8 deletions
diff --git a/databases/py-sqlrelay/Makefile b/databases/py-sqlrelay/Makefile index 3777554371c..d25d4315f75 100644 --- a/databases/py-sqlrelay/Makefile +++ b/databases/py-sqlrelay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/08/22 12:22:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.20 2019/09/28 08:42:07 adam Exp $ PKGNAME= ${PYPKGPREFIX}-${DISTNAME} PKGREVISION= 9 @@ -8,15 +8,18 @@ COMMENT= Python extension for SQL Relay LICENSE= modified-bsd +PYTHON_VERSIONS_ACCEPTED= 36 27 # 37 fails as of 1.0.0 + .include "../../lang/python/pyversion.mk" -.if ${PYPKGPREFIX} == "py27" +.if ${_PYTHON_VERSION} == 27 CONFIGURE_ARGS+= --disable-python3 CONFIGURE_ARGS+= --with-python-prefix=${PREFIX} .else -CONFIGURE_ARGS+= --disable-python2 +CONFIGURE_ARGS+= --disable-python CONFIGURE_ARGS+= --with-python3-prefix=${PREFIX} .endif +CONFIGURE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX} BUILD_DIRS= src/api/python diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo index 91c5fd91619..e01d3d73d9b 100644 --- a/databases/sqlrelay/distinfo +++ b/databases/sqlrelay/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2018/05/04 14:26:41 fhajny Exp $ +$NetBSD: distinfo,v 1.25 2019/09/28 08:42:07 adam Exp $ SHA1 (sqlrelay-1.0.0.tar.gz) = 3f350a71fea8177a8e003524b6833347f741153b RMD160 (sqlrelay-1.0.0.tar.gz) = 1bc6c1ac02eb8a58c1aa8e2bacd0c8662a283aad @@ -6,7 +6,7 @@ SHA512 (sqlrelay-1.0.0.tar.gz) = 2722cd179dfcd6bbc4c78ea9149d00ec70ccd11d44cdcab Size (sqlrelay-1.0.0.tar.gz) = 4194484 bytes SHA1 (patch-ad) = cc4a94941ec737abede98bdd7b19bc902f755609 SHA1 (patch-config.mk.in) = 22e8459f49e20529289e1a99b10cebaa449af0c0 -SHA1 (patch-configure) = 689820a84f671923b96f64a62de08ce266f55501 +SHA1 (patch-configure) = a3c6c2179e5166525fbea9661966c2180668fb46 SHA1 (patch-etc_Makefile) = 28e9cac18314f1fc725603d47cb92ec6e54d7c63 SHA1 (patch-src_api_nodejs_Makefile) = fd932cd1c76a34cc5decbe4060fc7c37174631bb SHA1 (patch-src_api_nodejs_package__in.json) = 76e2ebc4e47d5ef38d0c96059b62460fef687d1e diff --git a/databases/sqlrelay/patches/patch-configure b/databases/sqlrelay/patches/patch-configure index 77da3268acb..1f6d3a0ab8d 100644 --- a/databases/sqlrelay/patches/patch-configure +++ b/databases/sqlrelay/patches/patch-configure @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.6 2017/01/16 13:13:13 fhajny Exp $ +$NetBSD: patch-configure,v 1.7 2019/09/28 08:42:07 adam Exp $ Cripple iODBC check, we're using UnixODBC and it was getting in the way. Fix Python 3 lookup. @@ -15,9 +15,12 @@ Fix Ruby support. NAME=iodbc HEADER=sql.h LIBNAME=iodbc -@@ -32426,12 +32426,12 @@ then +@@ -32424,14 +32424,14 @@ then + if ( test -n "$PYTHON3PATH" ) + then - for i in "3.9" "3.8" "3.7" "3.6" "3.5" "3.4" "3.3" "3.2" "3.1" "3.0" +- for i in "3.9" "3.8" "3.7" "3.6" "3.5" "3.4" "3.3" "3.2" "3.1" "3.0" ++ for i in "${PYVERSSUFFIX}" do - if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib64/python$i/config" ) + if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib64/python$i/config-$i" ) |