Skip to contentSkip to conversation

libubox: fix build with lua option

PATCH New Hadrien Boutteville 2 participants 2 messages Mar 27, 2014

lore
Share & tools
lore

Hadrien Boutteville

author
#0 lore raw

PATCH 1/1 libubox: fix build with lua option

Fixes
http://autobuild.buildroot.org/results/fc6/fc64896ca5c3b05dfe4b5c5e7d25fc4b6c9976ad/
and a bunch of similar failures.

When Lua package is selected, libubox sets an option to build with Lua binding. Unfortunately, if LUAPATH is not passed libubox seeks it on the host instead of staging due to hard coded pkg-config commands in its CMake file. As a result Lua is not found and the build fails. Fix it by passing LUAPATH in LIBUBOX_CONF_OPT.

Similarly, libubox seeks LUA_CFLAGS with the host's pkg-config for the same reason. To prevent potential errors, fix it by passing LUA_CFLAGS in LIBUBOX_CONF_OPT.

Finally, libubox 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.

Signed-off-by Hadrien Boutteville <[email protected]>
---
 package/libubox/libubox.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/libubox/libubox.mk +3 -1
index 28d5c63..22efc9a 100644
@@ -10,8 +10,10 @@ LIBUBOX_LICENSE = LGPLv2.1, GPLv2, BSD-3c, MIT
 LIBUBOX_INSTALL_STAGING = YES
 LIBUBOX_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_JSON_C),json-c)
 
-ifeq ($(BR2_PACKAGE_LUA),y)
+ifeq ($(BR2_PACKAGE_LUA_5_1),y)
 	LIBUBOX_DEPENDENCIES += lua
+	LIBUBOX_CONF_OPT += -DLUAPATH=$(STAGING_DIR)/usr/lib/lua/5.1 \
+		-DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include
 else
 	LIBUBOX_CONF_OPT += -DBUILD_LUA:BOOL=OFF
 endif
#1 lore raw

PATCH 1/1 libubox: fix build with lua option

Quoted 16 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Hadrien" == Hadrien Boutteville <[email protected]> writes:

Fixes
http://autobuild.buildroot.org/results/fc6/fc64896ca5c3b05dfe4b5c5e7d25fc4b6c9976ad/
and a bunch of similar failures.

When Lua package is selected, libubox sets an option to build with Lua binding. Unfortunately, if LUAPATH is not passed libubox seeks it on the host instead of staging due to hard coded pkg-config commands in its CMake file. As a result Lua is not found and the build fails. Fix it by passing LUAPATH in LIBUBOX_CONF_OPT.

Similarly, libubox seeks LUA_CFLAGS with the host's pkg-config for the same reason. To prevent potential errors, fix it by passing LUA_CFLAGS in LIBUBOX_CONF_OPT.

Quoted 5 lines

Finally, libubox 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.

Signed-off-by Hadrien Boutteville <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard