CVS commit: pkgsrc/databases

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Oct 26 11:11:33 UTC 2018

Modified Files:
        pkgsrc/databases/lua-sql-mysql: Makefile
        pkgsrc/databases/lua-sql-postgres: Makefile
        pkgsrc/databases/lua-sql-sqlite: Makefile
        pkgsrc/databases/lua-sql-sqlite3: Makefile

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/lua-sql-mysql/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/lua-sql-postgres/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/lua-sql-sqlite/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/lua-sql-sqlite3/Makefile

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

Modified files:

Index: pkgsrc/databases/lua-sql-mysql/Makefile
diff -u pkgsrc/databases/lua-sql-mysql/Makefile:1.1 pkgsrc/databases/lua-sql-mysql/Makefile:1.2
--- pkgsrc/databases/lua-sql-mysql/Makefile:1.1 Sat Oct  8 12:53:54 2016
+++ pkgsrc/databases/lua-sql-mysql/Makefile     Fri Oct 26 11:11:33 2018
@@ -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 @@ COMMENT=        MySQL bindings for Lua
 
 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"

Index: pkgsrc/databases/lua-sql-postgres/Makefile
diff -u pkgsrc/databases/lua-sql-postgres/Makefile:1.2 pkgsrc/databases/lua-sql-postgres/Makefile:1.3
--- pkgsrc/databases/lua-sql-postgres/Makefile:1.2      Sun Oct  9 21:41:56 2016
+++ pkgsrc/databases/lua-sql-postgres/Makefile  Fri Oct 26 11:11:33 2018
@@ -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 @@ COMMENT=      PostgreSQL bindings for Lua
 
 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"

Index: pkgsrc/databases/lua-sql-sqlite/Makefile
diff -u pkgsrc/databases/lua-sql-sqlite/Makefile:1.1 pkgsrc/databases/lua-sql-sqlite/Makefile:1.2
--- pkgsrc/databases/lua-sql-sqlite/Makefile:1.1        Sat Oct  8 12:57:07 2016
+++ pkgsrc/databases/lua-sql-sqlite/Makefile    Fri Oct 26 11:11:33 2018
@@ -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 @@ COMMENT=        SQLite 2.x bindings for Lua
 
 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"

Index: pkgsrc/databases/lua-sql-sqlite3/Makefile
diff -u pkgsrc/databases/lua-sql-sqlite3/Makefile:1.1 pkgsrc/databases/lua-sql-sqlite3/Makefile:1.2
--- pkgsrc/databases/lua-sql-sqlite3/Makefile:1.1       Sat Oct  8 12:58:22 2016
+++ pkgsrc/databases/lua-sql-sqlite3/Makefile   Fri Oct 26 11:11:33 2018
@@ -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 @@ COMMENT=        SQLite 3.x bindings for Lua
 
 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"