Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luarocks: fix site config for host build

Browse source 
The host utility is used to build other lua modules for the target.
For that, the site config needs to specify the correct arch/system type.
Use target dependent build/staging dirs to avoid issue when switching
between targets

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2020-01-31 18:00:37 +01:00
parent 34e19dbb6f
commit be3bcda92a
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lang/luarocks/Makefile
View file

@ -26,6 +26,9 @@ PKG_BUILD_DEPENDS:=lua/host
HOST_BUILD_DEPENDS:=$(PKG_BUILD_DEPENDS) HOST_BUILD_DEPENDS:=$(PKG_BUILD_DEPENDS)
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
HOST_BUILD_PREFIX:=$(STAGING_DIR)/host
HOST_BUILD_DIR:=$(BUILD_DIR)/host/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -49,14 +52,18 @@ CONFIGURE_ARGS = \
--with-lua=$(STAGING_DIR_HOSTPKG) --with-lua=$(STAGING_DIR_HOSTPKG)
HOST_CONFIGURE_ARGS= \ HOST_CONFIGURE_ARGS= \
--prefix=$(STAGING_DIR_HOSTPKG) \ --prefix=$(STAGING_DIR)/host \
--sysconfdir=$(STAGING_DIR_HOSTPKG)/etc \ --sysconfdir=$(STAGING_DIR)/host/etc \
--with-lua=$(STAGING_DIR_HOSTPKG) --with-lua=$(STAGING_DIR_HOSTPKG)
CONFIGURE_VARS = \ CONFIGURE_VARS = \
LUAROCKS_UNAME_S="Linux" \ LUAROCKS_UNAME_S="Linux" \
LUAROCKS_UNAME_M="$(ARCH)" LUAROCKS_UNAME_M="$(ARCH)"
HOST_CONFIGURE_VARS = \
LUAROCKS_UNAME_S="Linux" \
LUAROCKS_UNAME_M="$(ARCH)"
define Build/Compile define Build/Compile
$(call Build/Compile/Default,build) $(call Build/Compile/Default,build)
endef endef