Message ID | 1396902806-2308-1-git-send-email-romain.naour@openwide.fr |
---|---|
State | Accepted |
Commit | 48ac052e32227057a88e253976a4927f2ab7e3a2 |
Headers | show |
Romain, All, On 2014-04-07 22:33 +0200, Romain Naour spake thusly: > The Lua binding option of libubox need to be > explicitly disabled on no mmu case. > > Fixes: > http://autobuild.buildroot.net/results/1a5/1a5c50f8ca0ae70c1e0d3733765f521790b97a30/build-end.log > > Signed-off-by: Romain Naour <romain.naour@openwide.fr> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, Yann E. MORIN. > --- > package/libubox/libubox.mk | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk > index b552227..74db0cc 100644 > --- a/package/libubox/libubox.mk > +++ b/package/libubox/libubox.mk > @@ -10,14 +10,12 @@ 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_USE_MMU),y) # fork() > -ifeq ($(BR2_PACKAGE_LUA_5_1),y) > +ifeq ($(BR2_USE_MMU)$(BR2_PACKAGE_LUA_5_1),yy) > 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 > -endif # MMU > > $(eval $(cmake-package)) > -- > 1.9.0 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "Romain" == Romain Naour <romain.naour@openwide.fr> writes: > The Lua binding option of libubox need to be > explicitly disabled on no mmu case. > Fixes: > http://autobuild.buildroot.net/results/1a5/1a5c50f8ca0ae70c1e0d3733765f521790b97a30/build-end.log > Signed-off-by: Romain Naour <romain.naour@openwide.fr> Committed, thanks.
diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk index b552227..74db0cc 100644 --- a/package/libubox/libubox.mk +++ b/package/libubox/libubox.mk @@ -10,14 +10,12 @@ 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_USE_MMU),y) # fork() -ifeq ($(BR2_PACKAGE_LUA_5_1),y) +ifeq ($(BR2_USE_MMU)$(BR2_PACKAGE_LUA_5_1),yy) 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 -endif # MMU $(eval $(cmake-package))
The Lua binding option of libubox need to be explicitly disabled on no mmu case. Fixes: http://autobuild.buildroot.net/results/1a5/1a5c50f8ca0ae70c1e0d3733765f521790b97a30/build-end.log Signed-off-by: Romain Naour <romain.naour@openwide.fr> --- package/libubox/libubox.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)