diff --git a/DEVELOPERS b/DEVELOPERS index b23dab7aeb..643b5f1060 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1151,7 +1151,9 @@ F: package/json-glib/ N: Hervé Codina F: package/dtbocfg/ +F: package/lua-augeas/ F: support/testing/tests/package/test_dtbocfg.py +F: support/testing/tests/package/test_lua_augeas.py N: Hiroshi Kawashima F: package/gauche/ @@ -1986,10 +1988,12 @@ F: configs/galileo_defconfig N: Nicolas Carrier F: package/bmap-tools/ +F: package/lua-augeas/ F: package/php-xdebug/ F: package/python-augeas/ F: package/python-flask-expects-json/ F: package/python-git/ +F: support/testing/tests/package/test_lua_augeas.py F: support/testing/tests/package/sample_bmap_tools.sh F: support/testing/tests/package/sample_python_augeas.py F: support/testing/tests/package/sample_python_flask_expects_json.py diff --git a/package/Config.in b/package/Config.in index ba1ee4005c..8bfceeb820 100644 --- a/package/Config.in +++ b/package/Config.in @@ -660,6 +660,7 @@ menu "Lua libraries/modules" source "package/lpty/Config.in" source "package/lrandom/Config.in" source "package/lsqlite3/Config.in" + source "package/lua-augeas/Config.in" source "package/lua-basexx/Config.in" source "package/lua-binaryheap/Config.in" source "package/lua-bit32/Config.in" diff --git a/package/lua-augeas/Config.in b/package/lua-augeas/Config.in new file mode 100644 index 0000000000..6470033e9b --- /dev/null +++ b/package/lua-augeas/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_LUA_AUGEAS + bool "lua-augeas" + depends on !BR2_arc # augeas + depends on BR2_USE_WCHAR # augeas + select BR2_PACKAGE_AUGEAS + help + Lua binding for augeas library + + https://github.com/ncopa/lua-augeas + +comment "lua-augeas needs a toolchain w/ wchar" + depends on !BR2_arc + depends on !BR2_USE_WCHAR diff --git a/package/lua-augeas/lua-augeas.hash b/package/lua-augeas/lua-augeas.hash new file mode 100644 index 0000000000..07a6a676e6 --- /dev/null +++ b/package/lua-augeas/lua-augeas.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 694fe887eebac27b558c9695042405f70a86382e92916094e7ba5f411673fbc1 lua-augeas-a6eace5116d1a711218a7c9086a4e3c4db88ee57.tar.gz +sha256 1f5c5ee5da981332b7f73cc5a59af660b03104279e2aa21b6b86890430c3eff0 COPYRIGHT diff --git a/package/lua-augeas/lua-augeas.mk b/package/lua-augeas/lua-augeas.mk new file mode 100644 index 0000000000..930cf49b86 --- /dev/null +++ b/package/lua-augeas/lua-augeas.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# lua-augeas +# +################################################################################ + +LUA_AUGEAS_VERSION = a6eace5116d1a711218a7c9086a4e3c4db88ee57 +LUA_AUGEAS_SITE = $(call github,ncopa,lua-augeas,$(LUA_AUGEAS_VERSION)) +LUA_AUGEAS_LICENSE = MIT +LUA_AUGEAS_LICENSE_FILES = COPYRIGHT +LUA_AUGEAS_DEPENDENCIES = luainterpreter augeas host-pkgconf + +# LDFLAGS=$(LDFLAGS) is present to pass LDFLAGS from environment to the command +# line. With LDFLAGS set in the command line, related ordinary asignment present +# in the makefile are ignored and so lua-augeas makefile cannot not add '-L/lib' +# to this value. +LUA_AUGEAS_CONF_OPTS= \ + PKGCONFIG="$(PKG_CONFIG_HOST_BINARY)" \ + LDFLAGS="$(LDFLAGS)" \ + LUA_VERSION="$(LUAINTERPRETER_ABIVER)" \ + INSTALL_CMOD="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" + +define LUA_AUGEAS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + $(LUA_AUGEAS_CONF_OPTS) all +endef + +define LUA_AUGEAS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + $(LUA_AUGEAS_CONF_OPTS) DESTDIR="$(TARGET_DIR)" install +endef + +$(eval $(generic-package)) diff --git a/support/testing/tests/package/test_lua_augeas.py b/support/testing/tests/package/test_lua_augeas.py new file mode 100644 index 0000000000..2a612b6d32 --- /dev/null +++ b/support/testing/tests/package/test_lua_augeas.py @@ -0,0 +1,27 @@ +from tests.package.test_lua import TestLuaBase + + +class TestLuaLuaAugeas(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUA=y + BR2_PACKAGE_AUGEAS=y + BR2_PACKAGE_LUA_AUGEAS=y + """ + + def test_run(self): + self.login() + self.module_test("augeas") + + +class TestLuajitLuaAugeas(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUAJIT=y + BR2_PACKAGE_AUGEAS=y + BR2_PACKAGE_LUA_AUGEAS=y + """ + + def test_run(self): + self.login() + self.module_test("augeas")