aboutsummaryrefslogtreecommitdiff
path: root/package/luarocks/luarocks.mk
diff options
context:
space:
mode:
Diffstat (limited to 'package/luarocks/luarocks.mk')
-rw-r--r--package/luarocks/luarocks.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk
index 14f05b3498..dd11b738ad 100644
--- a/package/luarocks/luarocks.mk
+++ b/package/luarocks/luarocks.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LUAROCKS_VERSION = 3.3.1
+LUAROCKS_VERSION = 3.5.0
LUAROCKS_SITE = http://luarocks.org/releases
LUAROCKS_LICENSE = MIT
LUAROCKS_LICENSE_FILES = COPYING
@@ -17,8 +17,7 @@ LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/luarocks/config.lua
HOST_LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/luarocks/host-config.lua
define LUAROCKS_ADDON_EXTRACT
- mkdir $(@D)/src/luarocks/cmd/external
- cp package/luarocks/buildroot.lua $(@D)/src/luarocks/cmd/external/buildroot.lua
+ $(INSTALL) -D -m 0644 package/luarocks/buildroot.lua $(@D)/src/luarocks/cmd/external/buildroot.lua
endef
HOST_LUAROCKS_POST_EXTRACT_HOOKS += LUAROCKS_ADDON_EXTRACT
@@ -34,10 +33,11 @@ endef
define HOST_LUAROCKS_INSTALL_CMDS
rm -f $(LUAROCKS_CONFIG_FILE_DEFAULT)
$(MAKE1) -C $(@D) install
- cat $(LUAROCKS_CONFIG_FILE_DEFAULT) $(HOST_LUAROCKS_PKGDIR)/luarocks-br-config.lua \
- > $(LUAROCKS_CONFIG_FILE)
- cat $(LUAROCKS_CONFIG_FILE_DEFAULT) $(HOST_LUAROCKS_PKGDIR)/luarocks-br-host-config.lua \
- > $(HOST_LUAROCKS_CONFIG_FILE)
+ cp $(LUAROCKS_CONFIG_FILE_DEFAULT) $(LUAROCKS_CONFIG_FILE)
+ echo "-- BR cross-compilation" >> $(LUAROCKS_CONFIG_FILE)
+ echo "gcc_rpath = false" >> $(LUAROCKS_CONFIG_FILE)
+ echo "wrap_bin_scripts = false" >> $(LUAROCKS_CONFIG_FILE)
+ cp $(LUAROCKS_CONFIG_FILE_DEFAULT) $(HOST_LUAROCKS_CONFIG_FILE)
rm -f $(LUAROCKS_CONFIG_FILE_DEFAULT)
endef