diff options
author | Ted Trask <ttrask01@yahoo.com> | 2023-06-05 01:23:53 +0000 |
---|---|---|
committer | alice <alice@ayaya.dev> | 2023-06-05 02:16:41 +0000 |
commit | 94bfae4bd6c6d5ad8bb5e8986c3e4da34b1d4aa7 (patch) | |
tree | 258955a13fc8bfb1ea615e2b76ca930f887a498b | |
parent | 076ece6595a59b05960c376b96b4bbb7634a3d99 (diff) |
main/lua-sql: Fix CFLAGS for Lua 5.2 and greater
The newer versions of Lua were being built with the CFLAGS for all
earlier versions of Lua, plus its own. So, lua5.4-sql was being
built with the include files for Lua 5.2, 5.3, and 5.4. This broke
support for the lua_newuserdata macro, among others.
-rw-r--r-- | main/lua-sql/APKBUILD | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/lua-sql/APKBUILD b/main/lua-sql/APKBUILD index 116fa32d867..62bc5ff806c 100644 --- a/main/lua-sql/APKBUILD +++ b/main/lua-sql/APKBUILD @@ -6,7 +6,7 @@ _drivers="mysql postgres sqlite3 odbc" pkgname=lua-sql _pkgname=luasql pkgver=2.6.0 -pkgrel=3 +pkgrel=4 pkgdesc="Lua SQL drivers" url="http://lunarmodules.github.io/luasql/" arch="all" @@ -37,21 +37,21 @@ build() { local cflags lver for lver in $_luaversions; do - CFLAGS="$CFLAGS $(pkg-config lua$lver --cflags) -fPIC" + cflags="$CFLAGS $(pkg-config lua$lver --cflags) -fPIC" msg "Building for Lua $lver..." cd "$builddir-$lver" - make CFLAGS="$CFLAGS" DRIVER_LIBS="-lmysqlclient" \ + make CFLAGS="$cflags" DRIVER_LIBS="-lmysqlclient" \ mysql - make CFLAGS="$CFLAGS" DRIVER_LIBS="$(pkg-config --libs libpq)" \ + make CFLAGS="$cflags" DRIVER_LIBS="$(pkg-config --libs libpq)" \ postgres - make CFLAGS="$CFLAGS" DRIVER_LIBS="$(pkg-config --libs sqlite3)" \ + make CFLAGS="$cflags" DRIVER_LIBS="$(pkg-config --libs sqlite3)" \ sqlite3 - make CFLAGS="$CFLAGS -DUNIXODBC" DRIVER_LIBS="-lodbc" \ + make CFLAGS="$cflags -DUNIXODBC" DRIVER_LIBS="-lodbc" \ odbc done } |