[pkgsrc/trunk]: pkgsrc/databases lua-sql-*: Fix all the module builds.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/70a693d673b2
branches:  trunk
changeset: 324682:70a693d673b2
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Oct 26 11:11:33 2018 +0000

description:
lua-sql-*: Fix all the module builds.

In all cases they were trying to use variables that aren't used in the build
process, the sqlite include paths had typos, and sqlite3 was trying to use
sqlite2's buildlink3.mk

diffstat:

 databases/lua-sql-mysql/Makefile    |  6 +++---
 databases/lua-sql-postgres/Makefile |  6 +++---
 databases/lua-sql-sqlite/Makefile   |  6 +++---
 databases/lua-sql-sqlite3/Makefile  |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diffs (81 lines):

diff -r 27872a1e3c74 -r 70a693d673b2 databases/lua-sql-mysql/Makefile
--- a/databases/lua-sql-mysql/Makefile  Fri Oct 26 11:00:05 2018 +0000
+++ b/databases/lua-sql-mysql/Makefile  Fri Oct 26 11:11:33 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/10/08 12:53:54 kamil Exp $
+# $NetBSD: Makefile,v 1.2 2018/10/26 11:11:33 jperkin Exp $
 
 .include "Makefile.common"
 
@@ -9,8 +9,8 @@
 
 BUILD_TARGET=  mysql
 
-MAKE_FLAGS+=   DRIVER_LIBS_mysql="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib -L${BUILDLINK_PREFIX.mysql-client}/lib -lmysqlclient"
-MAKE_FLAGS+=   DRIVER_INCS_mysql=-I${BUILDLINK_PREFIX.mysql-client}/include/mysql
+# Abuse DRIVER_INCS to get our compiler flags into the build
+MAKE_FLAGS+=   DRIVER_INCS="${CFLAGS} ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib -L${BUILDLINK_PREFIX.mysql-client}/lib"
 
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 27872a1e3c74 -r 70a693d673b2 databases/lua-sql-postgres/Makefile
--- a/databases/lua-sql-postgres/Makefile       Fri Oct 26 11:00:05 2018 +0000
+++ b/databases/lua-sql-postgres/Makefile       Fri Oct 26 11:11:33 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/10/09 21:41:56 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2018/10/26 11:11:33 jperkin Exp $
 
 PKGREVISION= 1
 .include "../../databases/lua-sql-mysql/Makefile.common"
@@ -10,8 +10,8 @@
 
 BUILD_TARGET=  postgres
 
-MAKE_FLAGS+=   DRIVER_LIBS_postgres="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${PGSQL_TYPE}}/lib -L${BUILDLINK_PREFIX.${PGSQL_TYPE}}/lib -lpq"
-MAKE_FLAGS+=   DRIVER_INCS_postgres=-I${BUILDLINK_PREFIX.${PGSQL_TYPE}}/include
+# Abuse DRIVER_INCS to get our compiler flags into the build
+MAKE_FLAGS+=   DRIVER_INCS="${CFLAGS} ${COMPILER_RPATH_FLAG}${PGSQL_PREFIX}/lib -L${PGSQL_PREFIX}/lib"
 
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 27872a1e3c74 -r 70a693d673b2 databases/lua-sql-sqlite/Makefile
--- a/databases/lua-sql-sqlite/Makefile Fri Oct 26 11:00:05 2018 +0000
+++ b/databases/lua-sql-sqlite/Makefile Fri Oct 26 11:11:33 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/10/08 12:57:07 kamil Exp $
+# $NetBSD: Makefile,v 1.2 2018/10/26 11:11:33 jperkin Exp $
 
 .include "../../databases/lua-sql-mysql/Makefile.common"
 
@@ -9,8 +9,8 @@
 
 BUILD_TARGET=  sqlite
 
-MAKE_FLAGS+=   DRIVER_LIBS_sqlite="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite}/lib -L${BUILDLINK_PREFIX.sqlite}/lib -lsqlite"
-MAKE_FLAGS+=   DRIVER_INCS_sqlite=-I${BUILDLINK_PREFIX.sqlite}/includel
+# Abuse DRIVER_INCS to get our compiler flags into the build
+MAKE_FLAGS+=   DRIVER_INCS="${CFLAGS} ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite}/lib -L${BUILDLINK_PREFIX.sqlite}/lib"
 
 .include "../../databases/sqlite/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 27872a1e3c74 -r 70a693d673b2 databases/lua-sql-sqlite3/Makefile
--- a/databases/lua-sql-sqlite3/Makefile        Fri Oct 26 11:00:05 2018 +0000
+++ b/databases/lua-sql-sqlite3/Makefile        Fri Oct 26 11:11:33 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/10/08 12:58:22 kamil Exp $
+# $NetBSD: Makefile,v 1.2 2018/10/26 11:11:33 jperkin Exp $
 
 .include "../../databases/lua-sql-mysql/Makefile.common"
 
@@ -9,8 +9,8 @@
 
 BUILD_TARGET=  sqlite3
 
-MAKE_FLAGS+=   DRIVER_LIBS_sqlite="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite3}/lib -L${BUILDLINK_PREFIX.sqlite3}/lib -lsqlite3"
-MAKE_FLAGS+=   DRIVER_INCS_sqlite=-I${BUILDLINK_PREFIX.sqlite3}/includel
+# Abuse DRIVER_INCS to get our compiler flags into the build
+MAKE_FLAGS+=   DRIVER_INCS="${CFLAGS} ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite3}/lib -L${BUILDLINK_PREFIX.sqlite3}/lib"
 
-.include "../../databases/sqlite/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"