diff mbox series

[pkg-luarocks,v2,4/5] package/lua: allows to load native modules from host-lua

Message ID 20200322080706.19806-4-francois.perrad@gadz.org
State Accepted
Headers show
Series [pkg-luarocks,v2,1/5] package/luarocks: now luajit is dynamically detected by luarocks | expand

Commit Message

Francois Perrad March 22, 2020, 8:07 a.m. UTC
so, we need a liblua.so
and some modules require Lua 5.2 functions

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/lua/lua.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Thomas Petazzoni April 12, 2020, 12:59 p.m. UTC | #1
On Sun, 22 Mar 2020 09:07:05 +0100
Francois Perrad <fperrad@gmail.com> wrote:

> so, we need a liblua.so
> and some modules require Lua 5.2 functions
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  package/lua/lua.mk | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

Applied to master with an improved commit log.

Thomas
diff mbox series

Patch

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 8a5f9258a..2ff2fdf75 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -55,6 +55,9 @@  LUA_POST_PATCH_HOOKS += LUA_32BITS_LUACONF
 endif
 
 HOST_LUA_CFLAGS = -Wall -fPIC -DLUA_USE_DLOPEN -DLUA_USE_POSIX
+ifeq ($(BR2_PACKAGE_LUA_5_3),y)
+HOST_LUA_CFLAGS += -DLUA_COMPAT_5_2
+endif
 HOST_LUA_MYLIBS = -ldl
 
 define LUA_BUILD_CMDS
@@ -74,7 +77,7 @@  define HOST_LUA_BUILD_CMDS
 	CFLAGS="$(HOST_LUA_CFLAGS)" \
 	MYLDFLAGS="$(HOST_LDFLAGS)" \
 	MYLIBS="$(HOST_LUA_MYLIBS)" \
-	BUILDMODE=static \
+	BUILDMODE=dynamic \
 	PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
 	sed -e "s/@VERSION@/$(LUA_VERSION)/;s/@ABI@/$(LUAINTERPRETER_ABIVER)/;s/@MYLIBS@/$(HOST_LUA_MYLIBS)/" \
 		package/lua/lua.pc.in > $(@D)/lua.pc