- host-luarocks: update build

archive-configs/luarocks-config.lua

@@ -1,5 +1,8 @@
--- cross-compilation
+
 local function getenv(name) return os_getenv(name) or '' end
+
+-- cross-compilation
+
 variables.LUA_INCDIR = getenv('TARGET_INCLUDE_DIR')
 variables.LUA_LIBDIR = getenv('TARGET_LIB_DIR')
 variables.CC = getenv('TARGET_CC')
@@ -7,8 +10,12 @@ variables.LD = getenv('TARGET_LD')
 variables.CFLAGS = getenv('(TARGET_CFLAGS')
 variables.LDFLAGS = getenv('(TARGET_LDFLAGS')
 variables.LIBFLAG = [[-shared ]] .. getenv('TARGET_LDFLAGS')
+
 external_deps_dirs = { getenv('TARGET_DIR') }
 gcc_rpath = false
-rocks_trees = { getenv('TARGET_DIR') }
 wrap_bin_scripts = false
 deps_mode = [[none]]
+
+-- overriding rocks_trees
+
+rocks_trees = { getenv('TARGET_DIR') }

make/bootstrap.mk

@@ -9,7 +9,6 @@ BOOTSTRAP += $(BUILD_TMP)
 BOOTSTRAP += $(STAGING_DIR)
 BOOTSTRAP += $(IMAGE_DIR)
 BOOTSTRAP += $(UPDATE_DIR)
-BOOTSTRAP += $(HOST_DIR)/bin
 BOOTSTRAP += cross-libs
 BOOTSTRAP += bins
 BOOTSTRAP += includes

make/host-tools.mk

@@ -3,19 +3,19 @@
 #
 # -----------------------------------------------------------------------------
 
-host-preqs: \
+host-preqs: $(HOST_DIR)/bin \
 	host_pkg-config \
 	host_pkg-config-softlink \
 	host_mkfs.jffs2 \
 	host_sumtool \
 	host_mkimage \
-	host_lua \
-	host_luarocks \
 	host_zic \
 	host_parted \
 	host_mkfs.fat \
 	host_mtools \
 	host_resize2fs \
+	host_lua \
+	host_luarocks \
 	ccache
 
 # -----------------------------------------------------------------------------
@@ -290,11 +290,14 @@ $(HOST_LUAROCKS): $(HOST_LUA) $(ARCHIVE)/$(HOST_LUAROCKS_SOURCE) | $(HOST_DIR)
 		$(call apply_patches, $(HOST_LUAROCKS_PATCH)); \
 		./configure $(SILENT_OPT) \
 			--prefix=$(HOST_DIR) \
+			--sysconfdir=$(HOST_DIR)/etc \
 			--with-lua=$(HOST_DIR) \
 			--rocks-tree=$(TARGET_DIR) \
 		; \
+		rm -f $(HOST_LUAROCKS_CONFIG_FILE); \
+		$(MAKE); \
 		$(MAKE) install
-	install -m 0644 $(CONFIGS)/luarocks-config.lua $(HOST_LUAROCKS_CONFIG_FILE)
+	cat $(CONFIGS)/luarocks-config.lua >> $(HOST_LUAROCKS_CONFIG_FILE)
 	$(REMOVE)/luarocks-$(HOST_LUAROCKS_VER)
 	$(TOUCH)