parent
84ae78cac3
commit
945497ddc1
Binary file not shown.
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST EdisonCore-1.3.2.1.tar.gz 82522 BLAKE2B 758e02e462d4f86b95a66792ce26dda6d1a00506a8071f3716f9a7484fc992af9e1709a9bbb958ee71175b2c51c4574493a35b6eaa7a1bfab415ed4ce7e2a8b4 SHA512 6812b04edb1abdfc2486d66bb86d6370b76667de1603ab421d92a6ecc17a25014e0ab97f53dd4f1e75cacf32c31611e8f2dd6c740c840e349c3c762ae00df65f
|
||||
DIST edisoncore-1.3.2.1-ghc-8.8.patch 57508 BLAKE2B 0651b4be26461cfe2bd3a57742ee138863ec6b47940065754642bd6320d814dfc8cb63bd4b37131bb3135752d03cdab335c2f1ebf5ccd87bd9219bd39d43c3e3 SHA512 9e5b60ec6023f2be4af4ecae0fcf00f8b6f758ea6bbd21c3dea4d3dd9ff128736e743e9a020a445e27e4ff1fb6c43061427f042353fe84528f2d715b5784302b
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST luadbi-0.7.2.tar.gz 36462 BLAKE2B 581c7353bfa36b3f6cabed2df78372f8810300bf4525bf8d370e61d469f9daa5a5c40c58916164a8d0a621a61e983e85c67b23ef03f51212be79f09ad8512047 SHA512 891f99cbc8f1b5327ef820641a1608abf41410f2f28584b975cc3cf65154b9bebf6f1b9ca7d1818b9c965738ad700dd17ae042dfd2a7146cf755871ebae535b9
|
||||
DIST luadbi.0.5.tar.gz 22454 BLAKE2B 538fa935ece2a8e0f852cef33716570a6e85100ec26892d7a76c5b00a7fceb82411e2ebe29d25de42cf6ee6bdbfdf5102875bb4d04d65f86dfdc9d79fecef359 SHA512 4ed641e113e90acc8a4f6b3b2d0f5d5044c0fbbef3b2fdfb84d15e17115e45c553a33b19bfb165e5af11a2adce501d66859963e3363d3ab1c6a39b0b2ae92e62
|
||||
|
||||
@ -0,0 +1,55 @@
|
||||
From b72503cad0654878841172451b2ea860a59e30c1 Mon Sep 17 00:00:00 2001
|
||||
From: Conrad Kostecki <conrad@kostecki.com>
|
||||
Date: Tue, 13 Oct 2020 07:34:16 +0200
|
||||
Subject: [PATCH] dbd/mysql/statement.c: fix compilation with mysql-8
|
||||
|
||||
Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
|
||||
---
|
||||
dbd/mysql/dbd_mysql.h | 2 +-
|
||||
dbd/mysql/statement.c | 6 +++---
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dbd/mysql/dbd_mysql.h b/dbd/mysql/dbd_mysql.h
|
||||
index 233bc35..4777289 100644
|
||||
--- a/dbd/mysql/dbd_mysql.h
|
||||
+++ b/dbd/mysql/dbd_mysql.h
|
||||
@@ -3,7 +3,7 @@
|
||||
#endif
|
||||
|
||||
|
||||
-#include <mysql.h>
|
||||
+#include <mysql/mysql.h>
|
||||
#include <dbd/common.h>
|
||||
|
||||
#define DBD_MYSQL_CONNECTION "DBD.MySQL.Connection"
|
||||
diff --git a/dbd/mysql/statement.c b/dbd/mysql/statement.c
|
||||
index aca865a..6af4c39 100644
|
||||
--- a/dbd/mysql/statement.c
|
||||
+++ b/dbd/mysql/statement.c
|
||||
@@ -424,7 +424,7 @@ static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_
|
||||
|
||||
if (fields[i].type == MYSQL_TYPE_TIMESTAMP || fields[i].type == MYSQL_TYPE_DATETIME) {
|
||||
char str[20];
|
||||
- struct st_mysql_time *t = bind[i].buffer;
|
||||
+ MYSQL_TIME *t = bind[i].buffer;
|
||||
|
||||
snprintf(str, 20, "%d-%02d-%02d %02d:%02d:%02d", t->year, t->month, t->day, t->hour, t->minute, t->second);
|
||||
|
||||
@@ -435,7 +435,7 @@ static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_
|
||||
}
|
||||
} else if (fields[i].type == MYSQL_TYPE_TIME) {
|
||||
char str[9];
|
||||
- struct st_mysql_time *t = bind[i].buffer;
|
||||
+ MYSQL_TIME *t = bind[i].buffer;
|
||||
|
||||
snprintf(str, 9, "%02d:%02d:%02d", t->hour, t->minute, t->second);
|
||||
|
||||
@@ -446,7 +446,7 @@ static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_
|
||||
}
|
||||
} else if (fields[i].type == MYSQL_TYPE_DATE) {
|
||||
char str[20];
|
||||
- struct st_mysql_time *t = bind[i].buffer;
|
||||
+ MYSQL_TIME *t = bind[i].buffer;
|
||||
|
||||
snprintf(str, 11, "%d-%02d-%02d", t->year, t->month, t->day);
|
||||
|
||||
@ -0,0 +1,60 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="A database interface library for Lua"
|
||||
HOMEPAGE="https://github.com/mwild1/luadbi"
|
||||
SRC_URI="https://github.com/mwild1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
IUSE="mysql postgres +sqlite"
|
||||
REQUIRED_USE="|| ( mysql postgres sqlite )"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-lang/lua-5.1:=
|
||||
mysql? ( dev-db/mysql-connector-c:0= )
|
||||
postgres? ( dev-db/postgresql:= )
|
||||
sqlite? ( dev-db/sqlite )
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PN}-0.7.2-mysql-8.patch" )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Respect users CFLAGS
|
||||
sed -e 's/-g //' -e 's/-O2 //g' -i Makefile || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export AR CC
|
||||
|
||||
local myemakeargs=(
|
||||
"LUA_INC=-I$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)/lua5.1"
|
||||
)
|
||||
|
||||
use mysql && emake ${myemakeargs} MYSQL_INC="-I$(mariadb_config --libs)" mysql
|
||||
use postgres && emake ${myemakeargs} PSQL_INC="-I$(pg_config --libdir)" psql
|
||||
use sqlite emake ${myemakeargs} SQLITE3_INC="-I/usr/include" sqlite
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local myemakeargs=(
|
||||
DESTDIR="${ED}"
|
||||
LUA_CDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
|
||||
LUA_LDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
|
||||
)
|
||||
|
||||
use mysql && emake ${myemakeargs[@]} install_mysql
|
||||
use postgres && emake ${myemakeargs[@]} install_psql
|
||||
use sqlite && emake ${myemakeargs[@]} install_sqlite3
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
Tue, 13 Oct 2020 06:38:23 +0000
|
||||
Tue, 13 Oct 2020 09:08:22 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Tue, 13 Oct 2020 06:38:23 +0000
|
||||
Tue, 13 Oct 2020 09:08:22 +0000
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,15 @@
|
||||
BDEPEND=virtual/pkgconfig
|
||||
DEFINED_PHASES=compile install prepare
|
||||
DEPEND=>=dev-lang/lua-5.1:= mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite )
|
||||
DESCRIPTION=A database interface library for Lua
|
||||
EAPI=7
|
||||
HOMEPAGE=https://github.com/mwild1/luadbi
|
||||
IUSE=mysql postgres +sqlite
|
||||
KEYWORDS=~amd64 ~arm ~arm64 ~x86
|
||||
LICENSE=MIT
|
||||
RDEPEND=>=dev-lang/lua-5.1:= mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite )
|
||||
REQUIRED_USE=|| ( mysql postgres sqlite )
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/mwild1/luadbi/archive/v0.7.2.tar.gz -> luadbi-0.7.2.tar.gz
|
||||
_eclasses_=multilib 98584e405e2b0264d37e8f728327fed1 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
|
||||
_md5_=baf139884cb5975853a38af3870e768a
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
Tue, 13 Oct 2020 06:38:23 +0000
|
||||
Tue, 13 Oct 2020 09:08:22 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Tue 13 Oct 2020 06:38:22 AM UTC
|
||||
Tue 13 Oct 2020 09:08:22 AM UTC
|
||||
|
||||
@ -1 +1 @@
|
||||
Tue, 13 Oct 2020 07:00:01 +0000
|
||||
Tue, 13 Oct 2020 09:30:01 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
8bbc138c88743356486ac68aa630305c7bc43d24 1602569177 2020-10-13T06:06:17+00:00
|
||||
eb5cb74c880d460faf36db7a3204d04800b7c326 1602579684 2020-10-13T09:01:24+00:00
|
||||
|
||||
@ -1 +1 @@
|
||||
1602570901 Tue 13 Oct 2020 06:35:01 AM UTC
|
||||
1602579901 Tue 13 Oct 2020 09:05:01 AM UTC
|
||||
|
||||
@ -1 +1 @@
|
||||
Tue, 13 Oct 2020 06:38:23 +0000
|
||||
Tue, 13 Oct 2020 09:08:22 +0000
|
||||
|
||||
Binary file not shown.
Loading…
Reference in new issue