CVS commit: pkgsrc/databases

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Sep 28 08:42:07 UTC 2019

Modified Files:
        pkgsrc/databases/py-sqlrelay: Makefile
        pkgsrc/databases/sqlrelay: distinfo
        pkgsrc/databases/sqlrelay/patches: patch-configure

Log Message:
py-sqlrelay: fix buidling when multiple Python versions are installed


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/databases/py-sqlrelay/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/databases/sqlrelay/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/sqlrelay/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/py-sqlrelay/Makefile
diff -u pkgsrc/databases/py-sqlrelay/Makefile:1.19 pkgsrc/databases/py-sqlrelay/Makefile:1.20
--- pkgsrc/databases/py-sqlrelay/Makefile:1.19  Thu Aug 22 12:22:58 2019
+++ pkgsrc/databases/py-sqlrelay/Makefile       Sat Sep 28 08:42:07 2019
@@ -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
 

Index: pkgsrc/databases/sqlrelay/distinfo
diff -u pkgsrc/databases/sqlrelay/distinfo:1.24 pkgsrc/databases/sqlrelay/distinfo:1.25
--- pkgsrc/databases/sqlrelay/distinfo:1.24     Fri May  4 14:26:41 2018
+++ pkgsrc/databases/sqlrelay/distinfo  Sat Sep 28 08:42:07 2019
@@ -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) = 2722cd1
 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

Index: pkgsrc/databases/sqlrelay/patches/patch-configure
diff -u pkgsrc/databases/sqlrelay/patches/patch-configure:1.6 pkgsrc/databases/sqlrelay/patches/patch-configure:1.7
--- pkgsrc/databases/sqlrelay/patches/patch-configure:1.6       Mon Jan 16 13:13:13 2017
+++ pkgsrc/databases/sqlrelay/patches/patch-configure   Sat Sep 28 08:42:07 2019
@@ -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" )