mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 14:01:57 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/luarocks: refactor infrastructure with DEPS_DIR

Browse Source 
DEPS_DIR is a new CLI option introduced by the version 3.4.0,
which avoids the use of `external_deps_dirs` in the config files.

now, the host config doesn't need to be altered.

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Francois Perrad
2020-09-28 17:43:49 +02:00
committed by Thomas Petazzoni
parent ebce163044
commit 5e196f97c9
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/luarocks/luarocks-br-config.lua
View File

@@ -1,5 +0,0 @@
-- BR cross-compilation
local function getenv (name) return os_getenv(name) or '' end
external_deps_dirs = { getenv('STAGING_DIR') .. [[/usr]] }
gcc_rpath = false
wrap_bin_scripts = false

3
package/luarocks/luarocks-br-host-config.lua
View File

@@ -1,3 +0,0 @@
-- BR host compilation
local function getenv (name) return os_getenv(name) or '' end
external_deps_dirs = { getenv('HOST_DIR') }

9
package/luarocks/luarocks.mk
View File

@@ -34,10 +34,11 @@ endef
define HOST_LUAROCKS_INSTALL_CMDS define HOST_LUAROCKS_INSTALL_CMDS
rm -f $(LUAROCKS_CONFIG_FILE_DEFAULT) rm -f $(LUAROCKS_CONFIG_FILE_DEFAULT)
$(MAKE1) -C $(@D) install $(MAKE1) -C $(@D) install
cat $(LUAROCKS_CONFIG_FILE_DEFAULT) $(HOST_LUAROCKS_PKGDIR)/luarocks-br-config.lua \ cp $(LUAROCKS_CONFIG_FILE_DEFAULT) $(LUAROCKS_CONFIG_FILE)
> $(LUAROCKS_CONFIG_FILE) echo "-- BR cross-compilation" >> $(LUAROCKS_CONFIG_FILE)
cat $(LUAROCKS_CONFIG_FILE_DEFAULT) $(HOST_LUAROCKS_PKGDIR)/luarocks-br-host-config.lua \ echo "gcc_rpath = false" >> $(LUAROCKS_CONFIG_FILE)
> $(HOST_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) rm -f $(LUAROCKS_CONFIG_FILE_DEFAULT)
endef endef

2
package/pkg-luarocks.mk
View File

@@ -112,6 +112,7 @@ define $(2)_INSTALL_TARGET_CMDS
LUAROCKS_CONFIG=$$(LUAROCKS_CONFIG_FILE) \ LUAROCKS_CONFIG=$$(LUAROCKS_CONFIG_FILE) \
$$(LUAROCKS_RUN_CMD) make --keep --deps-mode none \ $$(LUAROCKS_RUN_CMD) make --keep --deps-mode none \
--tree "$$(TARGET_DIR)/usr" \ --tree "$$(TARGET_DIR)/usr" \
DEPS_DIR="$$(STAGING_DIR)/usr" \
LUA_INCDIR="$$(STAGING_DIR)/usr/include" \ LUA_INCDIR="$$(STAGING_DIR)/usr/include" \
LUA_LIBDIR="$$(STAGING_DIR)/usr/lib" \ LUA_LIBDIR="$$(STAGING_DIR)/usr/lib" \
CC=$$(TARGET_CC) \ CC=$$(TARGET_CC) \
@@ -127,6 +128,7 @@ define $(2)_INSTALL_CMDS
cd $$($(2)_SRCDIR) && \ cd $$($(2)_SRCDIR) && \
LUAROCKS_CONFIG=$$(HOST_LUAROCKS_CONFIG_FILE) \ LUAROCKS_CONFIG=$$(HOST_LUAROCKS_CONFIG_FILE) \
$$(LUAROCKS_RUN_CMD) make --keep --deps-mode none \ $$(LUAROCKS_RUN_CMD) make --keep --deps-mode none \
DEPS_DIR="$$(HOST_DIR)" \
CFLAGS="$$(HOST_LUAROCKS_CFLAGS)" \ CFLAGS="$$(HOST_LUAROCKS_CFLAGS)" \
LIBFLAG="-shared $$(HOST_LDFLAGS)" \ LIBFLAG="-shared $$(HOST_LDFLAGS)" \
$$($(2)_BUILD_OPTS) $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPTS) $$($(2)_ROCKSPEC)