diff options
| -rw-r--r-- | main/lua-sql/APKBUILD | 32 | ||||
| -rw-r--r-- | main/lua-sql/luasql-mariadb.patch | 28 |
2 files changed, 11 insertions, 49 deletions
diff --git a/main/lua-sql/APKBUILD b/main/lua-sql/APKBUILD index 64e059371e..1db3ca41b7 100644 --- a/main/lua-sql/APKBUILD +++ b/main/lua-sql/APKBUILD @@ -5,14 +5,13 @@ _drivers="mysql postgres sqlite3 odbc" pkgname=lua-sql _pkgname=luasql -pkgver=2.3.5 -pkgrel=2 +pkgver=2.5.0 +pkgrel=0 pkgdesc="Lua SQL drivers" -url="http://keplerproject.github.io/luasql/doc/us/" +url="https://keplerproject.github.io/luasql/" arch="all" license="MIT" makedepends="mariadb-connector-c-dev postgresql-dev sqlite-dev unixodbc-dev" -subpackages="" for _v in $_luaversions; do makedepends="$makedepends lua$_v-dev" for _d in $_drivers; do @@ -23,22 +22,14 @@ for _d in $_drivers; do subpackages="$subpackages lua-sql-$_d:_meta_subpackage" done -source="$_pkgname-$pkgver.tar.gz::https://github.com/keplerproject/$_pkgname/archive/v$pkgver.tar.gz - luasql-mariadb.patch" +source="$_pkgname-$pkgver.tar.gz::https://github.com/keplerproject/$_pkgname/archive/$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" prepare() { - default_prepare || return 1 - - cd "$builddir" - - # The config has DRIVER_INCS but it seems like its not respected - # so we just fix the .c file. - sed -i 's:^\#include "mysql.h":\#include <mysql/mysql.h>:' \ - src/ls_mysql.c || return 1 + default_prepare local lver; for lver in $_luaversions; do - cp -r "$builddir" "$builddir-$lver" || return 1 + cp -r "$builddir" "$builddir-$lver" done } @@ -52,16 +43,16 @@ build() { cd "$builddir-$lver" make CFLAGS="$cflags" DRIVER_LIBS="-lmysqlclient" \ - mysql || return 1 + mysql make CFLAGS="$cflags" DRIVER_LIBS="$(pkg-config --libs libpq)" \ - postgres || return 1 + postgres make CFLAGS="$cflags" DRIVER_LIBS="$(pkg-config --libs sqlite3)" \ - sqlite3 || return 1 + sqlite3 make CFLAGS="$cflags -DUNIXODBC" DRIVER_LIBS="-lodbc" \ - odbc || return 1 + odbc done } @@ -93,5 +84,4 @@ _subpackage() { echo 'rock_manifest = {}' > "$rockdir"/rock_manifest } -sha512sums="28e25998366a2517cdd37933f0f00e0bb4b06bd9b6731209361777d6b755d62d763168dc78177cab5dfeee667deea04ff775912fb148ed145d64cea5407df4e7 luasql-2.3.5.tar.gz -1c587dd5f8964079e8836a951eaf6f40fdd9482ee08c022e9f51af8b3630b01e404f836689ba35cb9a8e6eb25578fb3d444c89975192509822a62f9d514a6b0e luasql-mariadb.patch" +sha512sums="474363c9feb6bc095d0d067d220a3a2faf0524172e082f217407bbe632d24575083ad8838725e4fb6cd369276ea6cb6f8547b84d9d9f77b9d87076404e2bce9e luasql-2.5.0.tar.gz" diff --git a/main/lua-sql/luasql-mariadb.patch b/main/lua-sql/luasql-mariadb.patch deleted file mode 100644 index 4237f6f94c..0000000000 --- a/main/lua-sql/luasql-mariadb.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6df3f672313f8dbca219199c8ec8d20c0247347f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1s=20Guisasola?= <tomasguisasola@gmail.com> -Date: Mon, 31 Jul 2017 09:41:49 -0300 -Subject: [PATCH] Add support for building with MariaDB (thanks to Florian - Weimer). - ---- - src/ls_mysql.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/ls_mysql.c b/src/ls_mysql.c -index f80fae4..843153b 100644 ---- a/src/ls_mysql.c -+++ b/src/ls_mysql.c -@@ -603,7 +603,12 @@ LUASQL_API int luaopen_luasql_mysql (lua_State *L) { - luaL_setfuncs(L, driver, 0); - luasql_set_info (L); - lua_pushliteral (L, "_CLIENTVERSION"); -- lua_pushliteral (L, MYSQL_SERVER_VERSION); -+#ifdef MARIADB_CLIENT_VERSION_STR -+lua_pushliteral (L, MARIADB_CLIENT_VERSION_STR); -+#else -+lua_pushliteral (L, MYSQL_SERVER_VERSION); -+#endif -+ /*lua_pushliteral (L, MYSQL_SERVER_VERSION);*/ - lua_settable (L, -3); - return 1; - } |