From: Rafał Miłecki Date: Fri, 21 Jun 2019 12:30:01 +0000 (+0200) Subject: lua: include version number in installed files X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=fe59b46ca7e0716e030a5d7cb0da9b4b6a79a8f4;p=openwrt%2Fstaging%2Fjow.git lua: include version number in installed files This will allow installing Lua 5.1 and newer versions at the same time. Signed-off-by: Rafał Miłecki --- diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile index 077a60fbf3..c911c6a913 100644 --- a/package/utils/lua/Makefile +++ b/package/utils/lua/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lua PKG_VERSION:=5.1.5 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.lua.org/ftp/ \ @@ -154,12 +154,14 @@ endef define Package/lua/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lua $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lua5.1 $(1)/usr/bin/ + $(LN) lua5.1 $(1)/usr/bin/lua endef define Package/luac/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luac $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luac5.1 $(1)/usr/bin/ + $(LN) luac5.1 $(1)/usr/bin/luac endef define Package/lua-examples/install diff --git a/package/utils/lua/patches-host/001-include-version-number.patch b/package/utils/lua/patches-host/001-include-version-number.patch new file mode 100644 index 0000000000..b7056fd47c --- /dev/null +++ b/package/utils/lua/patches-host/001-include-version-number.patch @@ -0,0 +1,48 @@ +From 96576b44a1b368bd6590eb0778ae45cc9ccede3f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Fri, 21 Jun 2019 14:08:38 +0200 +Subject: [PATCH] include version number + +Including it allows multiple lua versions to coexist. + +Signed-off-by: Rafał Miłecki +--- + +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -41,10 +41,10 @@ RANLIB= ranlib + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + + # What to install. +-TO_BIN= lua luac ++TO_BIN= lua$V luac$V + TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp + TO_LIB= liblua.a +-TO_MAN= lua.1 luac.1 ++TO_MAN= lua$V.1 luac$V.1 + + # Lua version and release. + V= 5.1 +diff --git a/doc/lua.1 b/doc/lua5.1.1 +rename from doc/lua.1 +rename to doc/lua5.1.1 +diff --git a/doc/luac.1 b/doc/luac5.1.1 +rename from doc/luac.1 +rename to doc/luac5.1.1 +diff --git a/src/Makefile b/src/Makefile +--- a/src/Makefile ++++ b/src/Makefile +@@ -29,10 +29,10 @@ CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ + LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \ + lstrlib.o loadlib.o linit.o + +-LUA_T= lua ++LUA_T= lua$V + LUA_O= lua.o + +-LUAC_T= luac ++LUAC_T= luac$V + LUAC_O= luac.o print.o + + ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) diff --git a/package/utils/lua/patches-host/010-lua-5.1.3-lnum-full-260308.patch b/package/utils/lua/patches-host/010-lua-5.1.3-lnum-full-260308.patch index b195352db1..4530edd181 100644 --- a/package/utils/lua/patches-host/010-lua-5.1.3-lnum-full-260308.patch +++ b/package/utils/lua/patches-host/010-lua-5.1.3-lnum-full-260308.patch @@ -1,13 +1,13 @@ --- a/Makefile +++ b/Makefile -@@ -42,7 +42,7 @@ +@@ -42,7 +42,7 @@ PLATS= aix ansi bsd freebsd generic linu # What to install. - TO_BIN= lua luac + TO_BIN= lua$V luac$V -TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp +TO_INC= lua.h luaconf.h lualib.h lauxlib.h lnum_config.h ../etc/lua.hpp TO_LIB= liblua.a - TO_MAN= lua.1 luac.1 + TO_MAN= lua$V.1 luac$V.1 --- a/src/Makefile +++ b/src/Makefile diff --git a/package/utils/lua/patches/001-include-version-number.patch b/package/utils/lua/patches/001-include-version-number.patch new file mode 100644 index 0000000000..b7056fd47c --- /dev/null +++ b/package/utils/lua/patches/001-include-version-number.patch @@ -0,0 +1,48 @@ +From 96576b44a1b368bd6590eb0778ae45cc9ccede3f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Fri, 21 Jun 2019 14:08:38 +0200 +Subject: [PATCH] include version number + +Including it allows multiple lua versions to coexist. + +Signed-off-by: Rafał Miłecki +--- + +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -41,10 +41,10 @@ RANLIB= ranlib + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + + # What to install. +-TO_BIN= lua luac ++TO_BIN= lua$V luac$V + TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp + TO_LIB= liblua.a +-TO_MAN= lua.1 luac.1 ++TO_MAN= lua$V.1 luac$V.1 + + # Lua version and release. + V= 5.1 +diff --git a/doc/lua.1 b/doc/lua5.1.1 +rename from doc/lua.1 +rename to doc/lua5.1.1 +diff --git a/doc/luac.1 b/doc/luac5.1.1 +rename from doc/luac.1 +rename to doc/luac5.1.1 +diff --git a/src/Makefile b/src/Makefile +--- a/src/Makefile ++++ b/src/Makefile +@@ -29,10 +29,10 @@ CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ + LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \ + lstrlib.o loadlib.o linit.o + +-LUA_T= lua ++LUA_T= lua$V + LUA_O= lua.o + +-LUAC_T= luac ++LUAC_T= luac$V + LUAC_O= luac.o print.o + + ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) diff --git a/package/utils/lua/patches/020-shared_liblua.patch b/package/utils/lua/patches/020-shared_liblua.patch index 64f683ddbe..f67ee2b3c7 100644 --- a/package/utils/lua/patches/020-shared_liblua.patch +++ b/package/utils/lua/patches/020-shared_liblua.patch @@ -3,12 +3,12 @@ @@ -42,8 +42,8 @@ PLATS= aix ansi bsd freebsd generic linu # What to install. - TO_BIN= lua luac + TO_BIN= lua$V luac$V -TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp -TO_LIB= liblua.a +TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp lnum_config.h +TO_LIB= liblua.a liblua.so.$R - TO_MAN= lua.1 luac.1 + TO_MAN= lua$V.1 luac$V.1 # Lua version and release. @@ -63,6 +63,7 @@ install: dummy @@ -87,10 +87,10 @@ CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ lundump.o lvm.o lzio.o lnum.o -@@ -33,11 +34,12 @@ LUA_T= lua +@@ -33,11 +34,12 @@ LUA_T= lua$V LUA_O= lua.o - LUAC_T= luac + LUAC_T= luac$V -LUAC_O= luac.o print.o +LUAC_O= luac.o print.o lopcodes.o