diff options
| author | Yegor Yefremov <yegorslists@googlemail.com> | 2014-04-05 16:36:57 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-04-05 19:06:41 +0200 |
| commit | e09c0444f70a2f60ff0e2c9b2d1d0840a5075f98 (patch) | |
| tree | 3314f206edd76094347b46df731bece2d79fa5af | |
| parent | 4955a31cecb698def9eb4b395fc297e56f76d492 (diff) | |
| download | buildroot-e09c0444f70a2f60ff0e2c9b2d1d0840a5075f98.tar.gz buildroot-e09c0444f70a2f60ff0e2c9b2d1d0840a5075f98.zip | |
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 <yegorslists@googlemail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/libuci/libuci.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/package/libuci/libuci.mk b/package/libuci/libuci.mk index 736b94689a..a7d3a809d4 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)) |
