Sat Sep 28 08:42:07 2019 UTC ()
py-sqlrelay: fix buidling when multiple Python versions are installed


(adam)
diff -r1.19 -r1.20 pkgsrc/databases/py-sqlrelay/Makefile
diff -r1.24 -r1.25 pkgsrc/databases/sqlrelay/distinfo
diff -r1.6 -r1.7 pkgsrc/databases/sqlrelay/patches/patch-configure
cvs diff -r1.19 -r1.20 pkgsrc/databases/py-sqlrelay/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/py-sqlrelay/Makefile 2019/08/22 12:22:58 1.19
+++ pkgsrc/databases/py-sqlrelay/Makefile 2019/09/28 08:42:07 1.20
@@ -1,27 +1,30 @@ @@ -1,27 +1,30 @@
1# $NetBSD: Makefile,v 1.19 2019/08/22 12:22:58 ryoon Exp $ 1# $NetBSD: Makefile,v 1.20 2019/09/28 08:42:07 adam Exp $
2 2
3PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 3PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
4PKGREVISION= 9 4PKGREVISION= 9
5COMMENT= Python extension for SQL Relay 5COMMENT= Python extension for SQL Relay
6 6
7.include "../../databases/sqlrelay/Makefile.common" 7.include "../../databases/sqlrelay/Makefile.common"
8 8
9LICENSE= modified-bsd 9LICENSE= modified-bsd
10 10
 11PYTHON_VERSIONS_ACCEPTED= 36 27 # 37 fails as of 1.0.0
 12
11.include "../../lang/python/pyversion.mk" 13.include "../../lang/python/pyversion.mk"
12 14
13.if ${PYPKGPREFIX} == "py27" 15.if ${_PYTHON_VERSION} == 27
14CONFIGURE_ARGS+= --disable-python3 16CONFIGURE_ARGS+= --disable-python3
15CONFIGURE_ARGS+= --with-python-prefix=${PREFIX} 17CONFIGURE_ARGS+= --with-python-prefix=${PREFIX}
16.else 18.else
17CONFIGURE_ARGS+= --disable-python2 19CONFIGURE_ARGS+= --disable-python
18CONFIGURE_ARGS+= --with-python3-prefix=${PREFIX} 20CONFIGURE_ARGS+= --with-python3-prefix=${PREFIX}
19.endif 21.endif
 22CONFIGURE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX}
20 23
21BUILD_DIRS= src/api/python 24BUILD_DIRS= src/api/python
22 25
23PY_PATCHPLIST= yes 26PY_PATCHPLIST= yes
24 27
25.include "../../databases/sqlrelay/buildlink3.mk" 28.include "../../databases/sqlrelay/buildlink3.mk"
26.include "../../lang/python/extension.mk" 29.include "../../lang/python/extension.mk"
27.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.24 -r1.25 pkgsrc/databases/sqlrelay/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/sqlrelay/distinfo 2018/05/04 14:26:41 1.24
+++ pkgsrc/databases/sqlrelay/distinfo 2019/09/28 08:42:07 1.25
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.24 2018/05/04 14:26:41 fhajny Exp $ 1$NetBSD: distinfo,v 1.25 2019/09/28 08:42:07 adam Exp $
2 2
3SHA1 (sqlrelay-1.0.0.tar.gz) = 3f350a71fea8177a8e003524b6833347f741153b 3SHA1 (sqlrelay-1.0.0.tar.gz) = 3f350a71fea8177a8e003524b6833347f741153b
4RMD160 (sqlrelay-1.0.0.tar.gz) = 1bc6c1ac02eb8a58c1aa8e2bacd0c8662a283aad 4RMD160 (sqlrelay-1.0.0.tar.gz) = 1bc6c1ac02eb8a58c1aa8e2bacd0c8662a283aad
5SHA512 (sqlrelay-1.0.0.tar.gz) = 2722cd179dfcd6bbc4c78ea9149d00ec70ccd11d44cdcabe7ad48e8cddf07588477ca9edf74660d498b2a6ae9e70a9e68733090c0a2122310995f566b0807349 5SHA512 (sqlrelay-1.0.0.tar.gz) = 2722cd179dfcd6bbc4c78ea9149d00ec70ccd11d44cdcabe7ad48e8cddf07588477ca9edf74660d498b2a6ae9e70a9e68733090c0a2122310995f566b0807349
6Size (sqlrelay-1.0.0.tar.gz) = 4194484 bytes 6Size (sqlrelay-1.0.0.tar.gz) = 4194484 bytes
7SHA1 (patch-ad) = cc4a94941ec737abede98bdd7b19bc902f755609 7SHA1 (patch-ad) = cc4a94941ec737abede98bdd7b19bc902f755609
8SHA1 (patch-config.mk.in) = 22e8459f49e20529289e1a99b10cebaa449af0c0 8SHA1 (patch-config.mk.in) = 22e8459f49e20529289e1a99b10cebaa449af0c0
9SHA1 (patch-configure) = 689820a84f671923b96f64a62de08ce266f55501 9SHA1 (patch-configure) = a3c6c2179e5166525fbea9661966c2180668fb46
10SHA1 (patch-etc_Makefile) = 28e9cac18314f1fc725603d47cb92ec6e54d7c63 10SHA1 (patch-etc_Makefile) = 28e9cac18314f1fc725603d47cb92ec6e54d7c63
11SHA1 (patch-src_api_nodejs_Makefile) = fd932cd1c76a34cc5decbe4060fc7c37174631bb 11SHA1 (patch-src_api_nodejs_Makefile) = fd932cd1c76a34cc5decbe4060fc7c37174631bb
12SHA1 (patch-src_api_nodejs_package__in.json) = 76e2ebc4e47d5ef38d0c96059b62460fef687d1e 12SHA1 (patch-src_api_nodejs_package__in.json) = 76e2ebc4e47d5ef38d0c96059b62460fef687d1e
13SHA1 (patch-src_api_php_sql__relay.cpp) = 9e33260f4e4331874187e5b30db17d4478710385 13SHA1 (patch-src_api_php_sql__relay.cpp) = 9e33260f4e4331874187e5b30db17d4478710385
14SHA1 (patch-src_api_ruby_getcflags.rb) = 033e26ef03db4851f493d831c37ec947662d47ee 14SHA1 (patch-src_api_ruby_getcflags.rb) = 033e26ef03db4851f493d831c37ec947662d47ee
15SHA1 (patch-src_api_ruby_getsitearchdir.rb) = 603c66ed45f854b833eefbcdbd58e41465fb8120 15SHA1 (patch-src_api_ruby_getsitearchdir.rb) = 603c66ed45f854b833eefbcdbd58e41465fb8120
16SHA1 (patch-src_api_ruby_rubyincludes1.h) = 7b06afbbdfc4d0ab4fd1288336eea795f4e1bce7 16SHA1 (patch-src_api_ruby_rubyincludes1.h) = 7b06afbbdfc4d0ab4fd1288336eea795f4e1bce7
17SHA1 (patch-src_api_ruby_sqlrelay.cpp) = 3081ffd0e2a373c14e6dd602728f72a1dfb6461b 17SHA1 (patch-src_api_ruby_sqlrelay.cpp) = 3081ffd0e2a373c14e6dd602728f72a1dfb6461b
cvs diff -r1.6 -r1.7 pkgsrc/databases/sqlrelay/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/databases/sqlrelay/patches/patch-configure 2017/01/16 13:13:13 1.6
+++ pkgsrc/databases/sqlrelay/patches/patch-configure 2019/09/28 08:42:07 1.7
@@ -1,33 +1,36 @@ @@ -1,33 +1,36 @@
1$NetBSD: patch-configure,v 1.6 2017/01/16 13:13:13 fhajny Exp $ 1$NetBSD: patch-configure,v 1.7 2019/09/28 08:42:07 adam Exp $
2 2
3Cripple iODBC check, we're using UnixODBC and it was getting in the way. 3Cripple iODBC check, we're using UnixODBC and it was getting in the way.
4Fix Python 3 lookup. 4Fix Python 3 lookup.
5Fix Ruby support. 5Fix Ruby support.
6 6
7--- configure.orig 2016-12-20 08:40:38.000000000 +0000 7--- configure.orig 2016-12-20 08:40:38.000000000 +0000
8+++ configure 8+++ configure
9@@ -26775,7 +26775,7 @@ fi 9@@ -26775,7 +26775,7 @@ fi
10  10
11  11
12  12
13-SEARCHPATH=$ODBCPATH 13-SEARCHPATH=$ODBCPATH
14+SEARCHPATH=OFF_$ODBCPATH 14+SEARCHPATH=OFF_$ODBCPATH
15 NAME=iodbc 15 NAME=iodbc
16 HEADER=sql.h 16 HEADER=sql.h
17 LIBNAME=iodbc 17 LIBNAME=iodbc
18@@ -32426,12 +32426,12 @@ then 18@@ -32424,14 +32424,14 @@ then
 19 if ( test -n "$PYTHON3PATH" )
 20 then
19  21
20 for i in "3.9" "3.8" "3.7" "3.6" "3.5" "3.4" "3.3" "3.2" "3.1" "3.0" 22- for i in "3.9" "3.8" "3.7" "3.6" "3.5" "3.4" "3.3" "3.2" "3.1" "3.0"
 23+ for i in "${PYVERSSUFFIX}"
21 do 24 do
22- if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib64/python$i/config" ) 25- if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib64/python$i/config" )
23+ if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib64/python$i/config-$i" ) 26+ if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib64/python$i/config-$i" )
24 then 27 then
25 PYTHON3INCLUDES="-I$PYTHON3PATH/include/python$i" 28 PYTHON3INCLUDES="-I$PYTHON3PATH/include/python$i"
26 PYTHON3DIR="$PYTHON3PATH/lib64/python$i" 29 PYTHON3DIR="$PYTHON3PATH/lib64/python$i"
27 else 30 else
28- if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib/python$i/config" ) 31- if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib/python$i/config" )
29+ if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib/python$i/config-$i" ) 32+ if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib/python$i/config-$i" )
30 then 33 then
31 PYTHON3INCLUDES="-I$PYTHON3PATH/include/python$i" 34 PYTHON3INCLUDES="-I$PYTHON3PATH/include/python$i"
32 PYTHON3DIR="$PYTHON3PATH/lib/python$i" 35 PYTHON3DIR="$PYTHON3PATH/lib/python$i"
33@@ -32938,7 +32938,7 @@ print CONFIG["arch"] 36@@ -32938,7 +32938,7 @@ print CONFIG["arch"]