From: Markham Date: Sat, 3 Oct 2020 17:20:21 +0000 (+0200) Subject: update target lua: install lua helpers X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=3368be35c6ea817bbbca624fee8716403beb4a74;p=bs-cst-neutrino-hd.git update target lua: install lua helpers --- diff --git a/archive-patches/lua-03-lua-pc.patch b/archive-patches/lua-03-lua-pc.patch index 452c852..ec643b4 100644 --- a/archive-patches/lua-03-lua-pc.patch +++ b/archive-patches/lua-03-lua-pc.patch @@ -14,7 +14,7 @@ Index: b/etc/lua.pc +# grep '^V=' ../Makefile +V= 5.2 +# grep '^R=' ../Makefile -+R= 5.2.1 ++R= 5.2.4 + +# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' +prefix= / diff --git a/make/libraries.mk b/make/libraries.mk index b737d42..6d97d50 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -1108,10 +1108,13 @@ $(D)/lua: $(D)/libncurses $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGETPREFIX) install -m 0755 -D $(BUILD_TMP)/lua-$(LUA_VER)/src/liblua.so.$(LUA_VER) $(TARGETPREFIX)/lib/liblua.so.$(LUA_VER) cd $(TARGETPREFIX)/lib; ln -sf liblua.so.$(LUA_VER) $(TARGETPREFIX)/lib/liblua.so cp -a $(GIT_PLUGINS)/scripts-lua/share/lua/$(LUA_ABIVER)/json.lua $(TARGETPREFIX)/share/lua/$(LUA_ABIVER) + cp -a $(GIT_PLUGINS)/scripts-lua/share/lua/$(LUA_ABIVER)/n_gui.lua $(TARGETPREFIX)/share/lua/$(LUA_ABIVER) + cp -a $(GIT_PLUGINS)/scripts-lua/share/lua/$(LUA_ABIVER)/n_helpers.lua $(TARGETPREFIX)/share/lua/$(LUA_ABIVER) install -m 0644 -D $(BUILD_TMP)/lua-$(LUA_VER)/etc/lua.pc $(PKG_CONFIG_PATH)/lua.pc $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/lua.pc rm -rf $(TARGETPREFIX)/bin/lua rm -rf $(TARGETPREFIX)/bin/luac + rm -rf $(TARGETPREFIX)/share/lua/1 $(REMOVE)/lua-$(LUA_VER) $(TOUCH)