Skip to content

Commit 5753055

Browse files
dragon-archerdragon-archer
committed
lua-{cjson,luarocks,filesystem}: rebuild for lua 5.5 & add package for 5.4
1 parent abe0c32 commit 5753055

File tree

8 files changed

+133
-35
lines changed

8 files changed

+133
-35
lines changed

‎mingw-w64-lua-cjson/PKGBUILD‎

Lines changed: 56 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ _realname=lua-${_pkgsuffix}
55
pkgbase=mingw-w64-${_realname}
66
pkgname=("${MINGW_PACKAGE_PREFIX}-lua-${_pkgsuffix}"
77
"${MINGW_PACKAGE_PREFIX}-lua51-${_pkgsuffix}"
8-
"${MINGW_PACKAGE_PREFIX}-lua53-${_pkgsuffix}")
8+
"${MINGW_PACKAGE_PREFIX}-lua53-${_pkgsuffix}"
9+
"${MINGW_PACKAGE_PREFIX}-lua54-${_pkgsuffix}")
910
pkgver=2.1.0.16
10-
pkgrel=1
11+
pkgrel=2
1112
arch=('any')
1213
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
1314
url='https://github.com/openresty/lua-cjson'
@@ -17,6 +18,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
1718
"${MINGW_PACKAGE_PREFIX}-lua"
1819
"${MINGW_PACKAGE_PREFIX}-lua51"
1920
"${MINGW_PACKAGE_PREFIX}-lua53"
21+
"${MINGW_PACKAGE_PREFIX}-lua54"
2022
"${MINGW_PACKAGE_PREFIX}-pkgconf")
2123
source=("${url}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz")
2224
sha256sums=('4b7e96801ee9596216d52d09cc4d21657cfd575971b6bbe9e317a698ae376a8a')
@@ -96,6 +98,38 @@ prepare() {
9698
sed -e "s/\#\!\/usr\/bin\/env lua/\#\!\/usr\/bin\/env lua${_lua_ver53}/" \
9799
-i $entry;
98100
done
101+
102+
# Lua 5.4
103+
_lua_ver54=$(pkgconf --variable=V lua5.4)
104+
_lua_ver_short54=$(echo $_lua_ver54 | sed -En "s/\.//p")
105+
106+
_options54=("LUA_VERSION=${_lua_ver54}"
107+
"PREFIX=${MINGW_PREFIX}"
108+
"TARGET=cjson.dll"
109+
"LUA_INCLUDE_DIR=${MINGW_PREFIX}/include/lua${_lua_ver54}"
110+
"CJSON_CFLAGS=-DDISABLE_INVALID_NUMBERS"
111+
"CJSON_LDFLAGS=-shared ${MINGW_PREFIX}/bin/lua${_lua_ver_short54}.dll"
112+
"LUA_BIN_SUFFIX=.lua")
113+
114+
cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/${_realname}-${pkgver}-54"
115+
116+
sed -e "s/json2lua\.lua/json2lua${_lua_ver_short54}.lua/" \
117+
-e "s/\#\!\/usr\/bin\/env lua/\#\!\/usr\/bin\/env lua${_lua_ver54}/" \
118+
-i "${srcdir}/${_realname}-${pkgver}-54"/lua/json2lua.lua
119+
120+
sed -e "s/lua2json\.lua/lua2json${_lua_ver_short54}.lua/" \
121+
-e "s/\#\!\/usr\/bin\/env lua/\#\!\/usr\/bin\/env lua${_lua_ver54}/" \
122+
-i "${srcdir}/${_realname}-${pkgver}-54"/lua/lua2json.lua
123+
124+
sed -e "s/json2lua\$(LUA_BIN_SUFFIX)/json2lua${_lua_ver_short54}\$(LUA_BIN_SUFFIX)/" \
125+
-e "s/lua2json\$(LUA_BIN_SUFFIX)/lua2json${_lua_ver_short54}\$(LUA_BIN_SUFFIX)/" \
126+
-i "${srcdir}/${_realname}-${pkgver}-54"/Makefile
127+
128+
for entry in "${srcdir}/${_realname}-${pkgver}-54"/tests/*.lua;
129+
do
130+
sed -e "s/\#\!\/usr\/bin\/env lua/\#\!\/usr\/bin\/env lua${_lua_ver54}/" \
131+
-i $entry;
132+
done
99133
}
100134

101135
build() {
@@ -112,13 +146,20 @@ build() {
112146
make \
113147
"${_options51[@]}" \
114148
all
115-
149+
116150
# Lua 5.3
117151
cd "${srcdir}/${_realname}-${pkgver}-53"
118152

119153
make \
120154
"${_options53[@]}" \
121155
all
156+
157+
# Lua 5.4
158+
cd "${srcdir}/${_realname}-${pkgver}-54"
159+
160+
make \
161+
"${_options54[@]}" \
162+
all
122163
}
123164

124165
package_lua-cjson() {
@@ -157,6 +198,18 @@ package_lua53-cjson() {
157198
install install-extra
158199
}
159200

201+
package_lua54-cjson() {
202+
depends=("${MINGW_PACKAGE_PREFIX}-lua54")
203+
pkgdesc="Lua CJSON is a fast JSON encoding/parsing module for Lua ${_lua_ver54} (mingw-w64)"
204+
205+
cd "${srcdir}/${_realname}-${pkgver}-54"
206+
207+
make \
208+
DESTDIR="${pkgdir}" \
209+
"${_options54[@]}" \
210+
install install-extra
211+
}
212+
160213
# generate wrappers
161214
for _name in "${pkgname[@]}"; do
162215
_short="package_${_name#${MINGW_PACKAGE_PREFIX}-}"

‎mingw-w64-lua-luarocks/PKGBUILD‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ _realname=luarocks
66
pkgbase=mingw-w64-lua-${_realname}
77
pkgname=("${MINGW_PACKAGE_PREFIX}-lua-${_realname}")
88
pkgver=3.13.0
9-
pkgrel=1
9+
pkgrel=2
1010
pkgdesc="the package manager for Lua modules (mingw-w64)"
1111
arch=('any')
1212
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -33,13 +33,15 @@ prepare() {
3333

3434
build() {
3535
cd "${srcdir}/${_realname}-${pkgver}"
36-
./configure --prefix=${MINGW_PREFIX} --lua-version=5.4 --with-lua-interpreter=lua.exe
37-
make ./build/luarocks ./build/luarocks-admin ./build/config-5.4.lua
36+
./configure --prefix=${MINGW_PREFIX} --lua-version=5.5 --with-lua-interpreter=lua.exe
37+
make ./build/luarocks ./build/luarocks-admin ./build/config-5.5.lua
3838
make LUA_VERSION=5.1 LUA_INTERPRETER=lua5.1.exe LUA_INCDIR=${MINGW_PREFIX}/include/lua5.1 ./build/config-5.1.lua
39+
make LUA_VERSION=5.4 LUA_INTERPRETER=lua5.4.exe LUA_INCDIR=${MINGW_PREFIX}/include/lua5.4 ./build/config-5.4.lua
3940
}
4041

4142
package() {
4243
cd "${srcdir}/${_realname}-${pkgver}"
4344
make DESTDIR="${pkgdir}" install
4445
make DESTDIR="$pkgdir" LUA_VERSION=5.1 install-config
46+
make DESTDIR="$pkgdir" LUA_VERSION=5.4 install-config
4547
}

‎mingw-w64-lua-luarocks/luarocks-CLANG64.install‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ post_install() {
44
PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
55
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
66
-i ${MINGW_PREFIX}/etc/luarocks/config-5.1.lua
7-
7+
88
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
9-
-i ${MINGW_PREFIX}/etc/luarocks/config-5.4.lua
10-
9+
-i ${MINGW_PREFIX}/etc/luarocks/config-5.5.lua
10+
1111
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
1212
-i ${MINGW_PREFIX}/bin/luarocks
13-
13+
1414
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
1515
-i ${MINGW_PREFIX}/bin/luarocks-admin
16-
16+
1717
}
1818

1919
post_upgrade() {

‎mingw-w64-lua-luarocks/luarocks-CLANGARM64.install‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ post_install() {
44
PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
55
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
66
-i ${MINGW_PREFIX}/etc/luarocks/config-5.1.lua
7-
7+
88
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
9-
-i ${MINGW_PREFIX}/etc/luarocks/config-5.4.lua
10-
9+
-i ${MINGW_PREFIX}/etc/luarocks/config-5.5.lua
10+
1111
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
1212
-i ${MINGW_PREFIX}/bin/luarocks
13-
13+
1414
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
1515
-i ${MINGW_PREFIX}/bin/luarocks-admin
16-
16+
1717
}
1818

1919
post_upgrade() {

‎mingw-w64-lua-luarocks/luarocks-MINGW32.install‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ post_install() {
44
PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
55
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
66
-i ${MINGW_PREFIX}/etc/luarocks/config-5.1.lua
7-
7+
88
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
9-
-i ${MINGW_PREFIX}/etc/luarocks/config-5.4.lua
10-
9+
-i ${MINGW_PREFIX}/etc/luarocks/config-5.5.lua
10+
1111
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
1212
-i ${MINGW_PREFIX}/bin/luarocks
13-
13+
1414
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
1515
-i ${MINGW_PREFIX}/bin/luarocks-admin
16-
16+
1717
}
1818

1919
post_upgrade() {

‎mingw-w64-lua-luarocks/luarocks-MINGW64.install‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ post_install() {
44
PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
55
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
66
-i ${MINGW_PREFIX}/etc/luarocks/config-5.1.lua
7-
7+
88
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
9-
-i ${MINGW_PREFIX}/etc/luarocks/config-5.4.lua
10-
9+
-i ${MINGW_PREFIX}/etc/luarocks/config-5.5.lua
10+
1111
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
1212
-i ${MINGW_PREFIX}/bin/luarocks
13-
13+
1414
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
1515
-i ${MINGW_PREFIX}/bin/luarocks-admin
16-
16+
1717
}
1818

1919
post_upgrade() {

‎mingw-w64-lua-luarocks/luarocks-UCRT64.install‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ post_install() {
44
PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
55
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
66
-i ${MINGW_PREFIX}/etc/luarocks/config-5.1.lua
7-
7+
88
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
9-
-i ${MINGW_PREFIX}/etc/luarocks/config-5.4.lua
10-
9+
-i ${MINGW_PREFIX}/etc/luarocks/config-5.5.lua
10+
1111
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
1212
-i ${MINGW_PREFIX}/bin/luarocks
13-
13+
1414
sed -s "s|${MINGW_PREFIX}|${PREFIX_WIN}|g" \
1515
-i ${MINGW_PREFIX}/bin/luarocks-admin
16-
16+
1717
}
1818

1919
post_upgrade() {

‎mingw-w64-luafilesystem/PKGBUILD‎

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ _realname=luafilesystem
44
pkgbase=mingw-w64-${_realname}
55
pkgname=("${MINGW_PACKAGE_PREFIX}-lua-${_realname}"
66
"${MINGW_PACKAGE_PREFIX}-lua51-${_realname}"
7-
"${MINGW_PACKAGE_PREFIX}-lua53-${_realname}")
7+
"${MINGW_PACKAGE_PREFIX}-lua53-${_realname}"
8+
"${MINGW_PACKAGE_PREFIX}-lua54-${_realname}")
89
_tagver=1_9_0
910
pkgver=1.9.0
10-
pkgrel=1
11+
pkgrel=2
1112
arch=('any')
1213
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
1314
url='https://github.com/lunarmodules/luafilesystem'
@@ -17,6 +18,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
1718
"${MINGW_PACKAGE_PREFIX}-lua"
1819
"${MINGW_PACKAGE_PREFIX}-lua51"
1920
"${MINGW_PACKAGE_PREFIX}-lua53"
21+
"${MINGW_PACKAGE_PREFIX}-lua54"
2022
"${MINGW_PACKAGE_PREFIX}-pkgconf")
2123
source=("${url}/archive/v${_tagver}.tar.gz"
2224
"001-makefile-for-mingw.patch")
@@ -31,6 +33,7 @@ prepare() {
3133

3234
cp -r "${srcdir}/${_realname}-${_tagver}" "${srcdir}/${_realname}-${_tagver}-51"
3335
cp -r "${srcdir}/${_realname}-${_tagver}" "${srcdir}/${_realname}-${_tagver}-53"
36+
cp -r "${srcdir}/${_realname}-${_tagver}" "${srcdir}/${_realname}-${_tagver}-54"
3437

3538
# current Lua
3639
_lua_ver=$(pkgconf --variable=V lua)
@@ -56,7 +59,7 @@ prepare() {
5659
"LUA_VERSION=${_lua_ver51}"
5760
"LUA_VERSION_SHORT=${_lua_ver_short51}"
5861
"")
59-
62+
6063
# Lua 5.3
6164
_lua_ver53=$(pkgconf --variable=V lua5.3)
6265
_lua_ver_short53=$(echo $_lua_ver53 | sed -En "s/\.//p")
@@ -69,6 +72,19 @@ prepare() {
6972

7073
sed -e "s/\#\!\/usr\/bin\/env lua5\.1/\#\!\/usr\/bin\/env lua${_lua_ver53}/" \
7174
-i "${srcdir}/${_realname}-${_tagver}-53"/tests/test.lua
75+
76+
# Lua 5.4
77+
_lua_ver54=$(pkgconf --variable=V lua5.4)
78+
_lua_ver_short54=$(echo $_lua_ver54 | sed -En "s/\.//p")
79+
80+
_options54=("--file=Makefile.mingw"
81+
"PREFIX=${MINGW_PREFIX}"
82+
"LUA_VERSION=${_lua_ver54}"
83+
"LUA_VERSION_SHORT=${_lua_ver_short54}"
84+
"")
85+
86+
sed -e "s/\#\!\/usr\/bin\/env lua5\.1/\#\!\/usr\/bin\/env lua${_lua_ver54}/" \
87+
-i "${srcdir}/${_realname}-${_tagver}-54"/tests/test.lua
7288
}
7389

7490
build() {
@@ -92,6 +108,13 @@ build() {
92108
make \
93109
"${_options53[@]}" \
94110
all
111+
112+
# Lua 5.4
113+
cd "${srcdir}/${_realname}-${_tagver}-54"
114+
115+
make \
116+
"${_options54[@]}" \
117+
all
95118
}
96119

97120
check() {
@@ -115,6 +138,13 @@ check() {
115138
make \
116139
"${_options53[@]}" \
117140
check
141+
142+
# Lua 5.4
143+
cd "${srcdir}/${_realname}-${_tagver}-54"
144+
145+
make \
146+
"${_options54[@]}" \
147+
check
118148
}
119149

120150
package_lua-luafilesystem() {
@@ -156,9 +186,22 @@ package_lua53-luafilesystem() {
156186
install -Dm644 "${srcdir}/${_realname}-${_tagver}-53/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/lua${_lua_ver_short53}-${_realname}/LICENSE"
157187
}
158188

189+
package_lua54-luafilesystem() {
190+
pkgdesc="File System Library for the Lua ${_lua_ver53} Programming Language (mingw-w64)"
191+
depends=("${MINGW_PACKAGE_PREFIX}-lua54")
192+
193+
cd "${srcdir}/${_realname}-${_tagver}-54"
194+
195+
DESTDIR="${pkgdir}" make \
196+
"${_options54[@]}" \
197+
install
198+
199+
install -Dm644 "${srcdir}/${_realname}-${_tagver}-54/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/lua${_lua_ver_short54}-${_realname}/LICENSE"
200+
}
201+
159202
# generate wrappers
160203
for _name in "${pkgname[@]}"; do
161204
_short="package_${_name#${MINGW_PACKAGE_PREFIX}-}"
162205
_func="$(declare -f "${_short}")"
163206
eval "${_func/#${_short}/package_${_name}}"
164-
done
207+
done

0 commit comments

Comments
 (0)