package/lua: bump to version 5.3.6
PATCH 1/1 package/lua: bump to version 5.3.6
Signed-off-by Francois Perrad <[email protected]>
---
.../lua/5.3.5/0003-fix-revision-number.patch | 31 -------------------
.../lua/{5.3.5 => 5.3.6}/0001-root-path.patch | 0
.../0002-shared-libs-for-lua.patch | 0
.../lua/{5.3.5 => 5.3.6}/0011-linenoise.patch | 0
package/lua/lua.hash | 5 +--
package/lua/lua.mk | 2 +-
6 files changed, 4 insertions(+), 34 deletions(-)
delete mode 100644 package/lua/5.3.5/0003-fix-revision-number.patch
rename package/lua/{5.3.5 => 5.3.6}/0001-root-path.patch (100%)
rename package/lua/{5.3.5 => 5.3.6}/0002-shared-libs-for-lua.patch (100%)
rename package/lua/{5.3.5 => 5.3.6}/0011-linenoise.patch (100%)package/lua/5.3.5/0003-fix-revision-number.patch deleted +0 -31
@@ -1,31 +0,0 @@ -Fix revision number - -In 0002-shared-libs-for-lua.patch, revision number is used to set -library name: -TO_SOLIB = liblua.so.$(R) - -However, library is built using PKG_VERSION which is passed only during -build step: -$(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $? - -As a result, dynamic library is not installed in staging or target paths -since bump to lua 5.3.5 - -So, instead of replacing R by PKG_VERSION and passing this variable in -all steps, simply update R to 5 - -Signed-off-by: Fabrice Fontaine <[email protected]> - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -47,6 +47,6 @@ - - # Lua version and release. - V= 5.3 --R= $V.4 -+R= $V.5 - - # Targets start here. - all: $(PLAT)
package/lua/5.3.6/0001-root-path.patch renamed from package/lua/5.3.5/0001-root-path.patch +0 -0
package/lua/5.3.6/0002-shared-libs-for-lua.patch renamed from package/lua/5.3.5/0002-shared-libs-for-lua.patch +0 -0
package/lua/5.3.6/0011-linenoise.patch renamed from package/lua/5.3.5/0011-linenoise.patch +0 -0
package/lua/lua.hash +3 -2
@@ -2,10 +2,11 @@ md5 dbf155764e5d433fc55ae80ea7060b60 lua-5.4.0.tar.gz sha1 8cdbffa8a214a23d190d7c45f38c19518ae62e89 lua-5.4.0.tar.gz -md5 4f4b4f323fd3514a68e0ab3da8ce3455 lua-5.3.5.tar.gz -sha1 112eb10ff04d1b4c9898e121d6bdf54a81482447 lua-5.3.5.tar.gz +md5 83f23dbd5230140a3770d5f54076948d lua-5.3.6.tar.gz +sha1 f27d20d6c81292149bc4308525a9d6733c224fa5 lua-5.3.6.tar.gz md5 2e115fe26e435e33b0d5c022e4490567 lua-5.1.5.tar.gz sha1 b3882111ad02ecc6b972f8c1241647905cb2e3fc lua-5.1.5.tar.gz + # Locally computed sha256 ee5e3e82af1e1b543c4f216e399d7c8cfee797711913f349e385101c4ae60a79 COPYRIGHT
package/lua/lua.mk +1 -1
@@ -7,7 +7,7 @@ ifeq ($(BR2_PACKAGE_LUA_5_4),y) LUA_VERSION = 5.4.0 else ifeq ($(BR2_PACKAGE_LUA_5_3),y) -LUA_VERSION = 5.3.5 +LUA_VERSION = 5.3.6 else LUA_VERSION = 5.1.5 endif
Signature · 1 line
2.25.1
Thomas Petazzoni
AppliedPATCH 1/1 package/lua: bump to version 5.3.6
Quoted 13 lines · On Fri, 25 Sep 2020 20:17:17 +0200 Francois Perrad <[email protected]> wrote:
Signed-off-by Francois Perrad <[email protected]>--- .../lua/5.3.5/0003-fix-revision-number.patch | 31 ------------------- .../lua/{5.3.5 => 5.3.6}/0001-root-path.patch | 0 .../0002-shared-libs-for-lua.patch | 0 .../lua/{5.3.5 => 5.3.6}/0011-linenoise.patch | 0 package/lua/lua.hash | 5 +-- package/lua/lua.mk | 2 +- 6 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 package/lua/5.3.5/0003-fix-revision-number.patch rename package/lua/{5.3.5 => 5.3.6}/0001-root-path.patch (100%) rename package/lua/{5.3.5 => 5.3.6}/0002-shared-libs-for-lua.patch (100%) rename package/lua/{5.3.5 => 5.3.6}/0011-linenoise.patch (100%)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/lua: bump to version 5.3.6
In reply to Francois PerradQuoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Francois" == Francois Perrad <[email protected]> writes:
Signed-off-by Francois Perrad <[email protected]>
Committed to 2020.02.x, 2020.05.x and 2020.08.x given the bugfixes, thanks.
I do see that we don't have a hash for doc/readme.html, and that the content differs between 5.3.6 and 5.4.0, so that is no good :/
I guess we need to move to separate <version>/lua.hash files for each version. Is this something you could do?
Thanks.
Signature · 1 line
Bye, Peter Korsgaard