Skip to content

Commit 6458cb0

Browse files
LuciogiLuciogi
committed
lua*-luadbi: update to 0.7.5, enable lua55 build
1 parent 4186f9e commit 6458cb0

2 files changed

Lines changed: 53 additions & 57 deletions

File tree

‎srcpkgs/lua54-luadbi/patches/fix-makefile.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/Makefile b/Makefile
2+
index e0066f6..20ed1b3 100644
3+
--- a/Makefile
4+
+++ b/Makefile
5+
@@ -140,7 +140,7 @@ install_sqlite3: sqlite3 install_lua
6+
$(INSTALL_PROGRAM) -D $(DBDSQLITE3) $(DESTDIR)$(LUA_CDIR)/$(DBDSQLITE3)
7+
8+
install_duckdb: duckdb install_lua
9+
- $(INSTALL_PROGRAM) -D $(DBDDUCKDB) $(DESTDIR)$(LUA_CDIR)/$DBDDUCKDB)
10+
+ $(INSTALL_PROGRAM) -D $(DBDDUCKDB) $(DESTDIR)$(LUA_CDIR)/$(DBDDUCKDB)
11+
12+
install_db2: db2 install_lua
13+
$(INSTALL_PROGRAM) -D $(DBDDB2) $(DESTDIR)$(LUA_CDIR)/$(DBDDB2)

‎srcpkgs/lua54-luadbi/template‎

Lines changed: 40 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,81 @@
11
# Template file for 'lua54-luadbi'
22
pkgname=lua54-luadbi
3-
version=0.5
4-
revision=5
5-
create_wrksrc="yes"
6-
makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
7-
postgresql-libs-devel libmariadbclient-devel"
3+
version=0.7.5
4+
revision=1
5+
makedepends="lua51-devel lua52-devel lua53-devel lua54-devel lua55-devel
6+
sqlite-devel postgresql-libs-devel libmariadbclient-devel duckdb-devel"
87
_desc="Lua database interface library"
98
short_desc="${_desc} (5.4.x)"
109
maintainer="Orphaned <orphan@voidlinux.org>"
1110
license="MIT"
12-
homepage="https://code.google.com/archive/p/luadbi/"
13-
distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/luadbi/luadbi.$version.tar.gz"
14-
checksum=49116458dd80052536bf5d7e2b2a1f5a0fa42a671ce77f1cb7355ef7faeb331e
11+
homepage="https://github.com/mwild1/luadbi"
12+
distfiles="https://github.com/mwild1/luadbi/archive/refs/tags/v${version}.tar.gz>luadbi-${version}.tar.gz"
13+
checksum=d11990029946cf29ee33cdb563900ba8e105207c507b08887896e88e429d8429
1514

16-
post_extract() {
17-
cd ${wrksrc}
18-
mkdir -p lua51
19-
mv * lua51 || true
20-
cp -a lua51 lua52
21-
cp -a lua51 lua53
22-
cp -a lua51 lua54
23-
}
15+
_lua_vers=("5.1" "5.2" "5.3" "5.4" "5.5")
2416

2517
_common_cflags="-pedantic -Wall -O2 -shared -fpic -I${XBPS_CROSS_BASE}/usr/include/mysql -I${XBPS_CROSS_BASE}/usr/include/postgresql/server -I."
2618

2719
if [[ -n "${CROSS_BUILD}" ]]; then
2820
_common_cflags+=" -I${XBPS_CROSS_BASE}/usr/include"
2921
fi
3022

31-
do_build() {
32-
cd ${wrksrc}/lua51
33-
make CC="$CC" AR="$AR" RANLIB="$RANLIB" CFLAGS="${_common_cflags} -I${XBPS_CROSS_BASE}/usr/include/lua5.1" ${makejobs} free
34-
35-
cd ${wrksrc}/lua52
36-
make CC="$CC" AR="$AR" RANLIB="$RANLIB" CFLAGS="${_common_cflags} -I${XBPS_CROSS_BASE}/usr/include/lua5.2" ${makejobs} free
37-
38-
cd ${wrksrc}/lua53
39-
make CC="$CC" AR="$AR" RANLIB="$RANLIB" CFLAGS="${_common_cflags} -I${XBPS_CROSS_BASE}/usr/include/lua5.3" ${makejobs} free
40-
41-
cd ${wrksrc}/lua54
42-
make CC="$CC" AR="$AR" RANLIB="$RANLIB" CFLAGS="${_common_cflags} -I${XBPS_CROSS_BASE}/usr/include/lua5.4" ${makejobs} free
43-
}
23+
post_patch() {
24+
cd ${wrksrc}
25+
_source_files=$(ls)
4426

45-
do_install() {
46-
cd ${wrksrc}/lua51
47-
for lib in *.so; do
48-
vinstall ${lib} 755 usr/lib/lua/5.1
49-
done
50-
vinstall DBI.lua 644 usr/share/lua/5.1/
27+
mkdir lua51
28+
mv ${_source_files} lua51
5129

52-
cd ${wrksrc}/lua52
53-
for lib in *.so; do
54-
vinstall ${lib} 755 usr/lib/lua/5.2
30+
for ver in ${_lua_vers[@]:1}; do
31+
cp -a lua51 "lua${ver/./}"
5532
done
56-
vinstall DBI.lua 644 usr/share/lua/5.2/
33+
}
5734

58-
cd ${wrksrc}/lua53
59-
for lib in *.so; do
60-
vinstall ${lib} 755 usr/lib/lua/5.3
35+
do_build() {
36+
for ver in ${_lua_vers[@]}; do
37+
cd "${wrksrc}/lua${ver/./}"
38+
msg_normal "building for lua ${ver}\n"
39+
make CC="$CC" AR="$AR" RANLIB="$RANLIB" CFLAGS="${_common_cflags} -I${XBPS_CROSS_BASE}/usr/include/lua${ver}" LUA_V="${ver}" ${makejobs} free
6140
done
62-
vinstall DBI.lua 644 usr/share/lua/5.3/
41+
}
6342

64-
cd ${wrksrc}/lua54
65-
for lib in *.so; do
66-
vinstall ${lib} 755 usr/lib/lua/5.4
67-
done
68-
vinstall DBI.lua 644 usr/share/lua/5.4/
43+
_lua_install() {
44+
_ver=$1
45+
cd "${wrksrc}/lua${_ver/./}"
46+
make install_free DESTDIR="${PKGDESTDIR}" LUA_V="${_ver}"
6947
vlicense COPYING
7048
}
7149

50+
do_install() {
51+
_lua_install "5.4"
52+
}
53+
7254
lua51-luadbi_package() {
7355
short_desc="${_desc} (5.1.x)"
7456
pkg_install() {
75-
vmove usr/lib/lua/5.1
76-
vmove usr/share/lua/5.1
77-
vlicense ${wrksrc}/lua51/COPYING
57+
_lua_install "5.1"
7858
}
7959
}
8060

8161
lua52-luadbi_package() {
8262
short_desc="${_desc} (5.2.x)"
8363
pkg_install() {
84-
vmove usr/lib/lua/5.2
85-
vmove usr/share/lua/5.2
86-
vlicense ${wrksrc}/lua52/COPYING
64+
_lua_install "5.2"
8765
}
8866
}
8967

9068
lua53-luadbi_package() {
9169
short_desc="${_desc} (5.3.x)"
9270
pkg_install() {
93-
vmove usr/lib/lua/5.3
94-
vmove usr/share/lua/5.3
95-
vlicense ${wrksrc}/lua53/COPYING
71+
_lua_install "5.3"
72+
}
73+
}
74+
75+
lua55-luadbi_package() {
76+
short_desc="${_desc} (5.5.x)"
77+
pkg_install() {
78+
_lua_install "5.5"
9679
}
9780
}
9881

0 commit comments

Comments
 (0)