Skip to content

Commit

Permalink
lua: update to 5.3.5 and fix install
Browse files Browse the repository at this point in the history
- modified patch not to stumble upon external $V
- pkg-config use $LUA_V intead of $V
  • Loading branch information
wwwutz committed Mar 3, 2020
1 parent 5780a3d commit 5fbe067
Showing 1 changed file with 42 additions and 35 deletions.
77 changes: 42 additions & 35 deletions lua.be0
Original file line number Diff line number Diff line change
@@ -1,60 +1,65 @@
#!/bin/env beesh

# BEE_VERSION lua-5.3.3-1
# BEE_VERSION lua-5.3.5-0

SRCURL[0]="https://www.lua.org/ftp/lua-${PKGVERSION}.tar.gz"

PATCHURL[0]="http://www.linuxfromscratch.org/patches/blfs/7.9/lua-5.3.2-shared_library-1.patch"

PGRP=( uncategorized )
# PATCHURL[0]="http://www.linuxfromscratch.org/patches/blfs/svn/lua-5.3.5-shared_library-1.patch"
# LFS/AUR patch is just plain messy using $V

PATCHURL+=("/src/mariux/patches/lua-5.3.5-mariux-shared_library.patch")

B=${S}
build_in_sourcedir

# sourcesubdir_append src

BEE_CONFIGURE=none

# EXCLUDE=""
#mee_extract() {
# bee_extract "${@}"
#}

mee_patch() {
bee_patch
}
#mee_patch() {
# bee_patch "${@}"
#}

mee_configure() {
bee_configure
}
#mee_configure() {
# bee_configure
#}

mee_build() {
sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h

bee_build linux "MYCFLAGS=-fPIC -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1"
cat >lua.pc <<-EOF
V=${PKGVERSION[2]}
R=${PKGVERSION}
prefix=${PREFIX}

INSTALL_BIN=\${prefix}/bin
INSTALL_INC=\${prefix}/include
INSTALL_LIB=\${prefix}/lib
INSTALL_MAN=\${prefix}/man/man1
INSTALL_LMOD=\${prefix}/share/lua/${V}
INSTALL_CMOD=\${prefix}/lib/lua/${V}

exec_prefix=\${prefix}
libdir=\${exec_prefix}/lib
includedir=\${prefix}/include

Name: Lua
Description: An Extensible Extension Language
Version: \${R}
Requires:
Libs: -L\${libdir} -llua -lm
Cflags: -I\${includedir}
EOF

cat >lua.pc <<EOF
LUA_V=${PKGVERSION[2]}
LUA_R=${PKGVERSION}
prefix=${PREFIX}

INSTALL_BIN=\${prefix}/bin
INSTALL_INC=\${prefix}/include
INSTALL_LIB=\${prefix}/lib
INSTALL_MAN=\${prefix}/man/man1
INSTALL_LMOD=\${prefix}/share/lua/\${LUA_V}
INSTALL_CMOD=\${prefix}/lib/lua/\${LUA_V}

exec_prefix=\${prefix}
libdir=\${exec_prefix}/lib
includedir=\${prefix}/include

Name: Lua
Description: An Extensible Extension Language
Version: \${LUA_R}
Requires:
Libs: -L\${libdir} -llua -lm -ldl
Cflags: -I\${includedir}
EOF
}

mee_install() {
bee_install V=1 INSTALL_TOP=${D}${PREFIX} \
bee_install INSTALL_TOP=${D}${PREFIX} \
TO_LIB="liblua.so liblua.so.${PKGVERSION[2]} liblua.so.${PKGVERSION}" \
INSTALL_DATA="cp -d" \
INSTALL_MAN="${D}/${MANDIR}/man1"
Expand All @@ -67,3 +72,5 @@ mee_install_post() {
mkdir -pv ${D}/${LIBDIR}/pkgconfig
install -v -m644 -D ${B}/lua.pc ${D}${LIBDIR}/pkgconfig
}


0 comments on commit 5fbe067

Please sign in to comment.