From e09c0444f70a2f60ff0e2c9b2d1d0840a5075f98 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Sat, 5 Apr 2014 16:36:57 +0200 Subject: [PATCH] libuci: Lua binding needs mmu and version 5.1 The Lua binding option of libuci uses fork() so it needs the MMU. Finally, libuci fails to build with Lua 5.2 because it uses functions removed from this version. Fix it by activating the option only with Lua 5.1. [Thomas: use LIBUCI_ and not LIBUBOX_ otherwise the patch doesn't work.] Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/libuci/libuci.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/libuci/libuci.mk b/package/libuci/libuci.mk index 736b94689..a7d3a809d 100644 --- a/package/libuci/libuci.mk +++ b/package/libuci/libuci.mk @@ -10,10 +10,14 @@ LIBUCI_LICENSE = LGPLv2.1 LIBUCI_INSTALL_STAGING = YES LIBUCI_DEPENDENCIES = libubox -ifeq ($(BR2_PACKAGE_LUA),y) - LIBUCI_DEPENDENCIES += lua +ifeq ($(BR2_USE_MMU),y) # fork() +ifeq ($(BR2_PACKAGE_LUA_5_1),y) +LIBUCI_DEPENDENCIES += lua +LIBUCI_CONF_OPT += -DLUAPATH=$(STAGING_DIR)/usr/lib/lua/5.1 \ + -DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include else - LIBUCI_CONF_OPT += -DBUILD_LUA:BOOL=OFF +LIBUCI_CONF_OPT += -DBUILD_LUA:BOOL=OFF endif +endif # MMU $(eval $(cmake-package))