aboutsummaryrefslogtreecommitdiff
path: root/package/lua
diff options
context:
space:
mode:
Diffstat (limited to 'package/lua')
-rw-r--r--package/lua/5.1.5/lua.hash6
-rw-r--r--package/lua/5.3.5/0003-fix-revision-number.patch31
-rw-r--r--package/lua/5.3.6/0001-root-path.patch (renamed from package/lua/5.3.5/0001-root-path.patch)0
-rw-r--r--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
-rw-r--r--package/lua/5.3.6/0003-linenoise.patch (renamed from package/lua/5.3.5/0011-linenoise.patch)0
-rw-r--r--package/lua/5.3.6/lua.hash6
-rw-r--r--package/lua/5.4.2/0001-root-path.patch (renamed from package/lua/5.4.0/0001-root-path.patch)2
-rw-r--r--package/lua/5.4.2/0002-shared-libs-for-lua.patch (renamed from package/lua/5.4.0/0002-shared-libs-for-lua.patch)0
-rw-r--r--package/lua/5.4.2/0011-linenoise.patch (renamed from package/lua/5.4.0/0011-linenoise.patch)0
-rw-r--r--package/lua/5.4.2/lua.hash6
-rw-r--r--package/lua/lua.hash11
-rw-r--r--package/lua/lua.mk7
12 files changed, 23 insertions, 46 deletions
diff --git a/package/lua/5.1.5/lua.hash b/package/lua/5.1.5/lua.hash
new file mode 100644
index 0000000000..22ff8b7dad
--- /dev/null
+++ b/package/lua/5.1.5/lua.hash
@@ -0,0 +1,6 @@
+# Hashes from: http://www.lua.org/ftp/
+md5 2e115fe26e435e33b0d5c022e4490567 lua-5.1.5.tar.gz
+sha1 b3882111ad02ecc6b972f8c1241647905cb2e3fc lua-5.1.5.tar.gz
+
+# Locally computed
+sha256 ee5e3e82af1e1b543c4f216e399d7c8cfee797711913f349e385101c4ae60a79 COPYRIGHT
diff --git a/package/lua/5.3.5/0003-fix-revision-number.patch b/package/lua/5.3.5/0003-fix-revision-number.patch
deleted file mode 100644
index ed2e0460eb..0000000000
--- a/package/lua/5.3.5/0003-fix-revision-number.patch
+++ /dev/null
@@ -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 <fontaine.fabrice@gmail.com>
-
-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)
diff --git a/package/lua/5.3.5/0001-root-path.patch b/package/lua/5.3.6/0001-root-path.patch
index a44c55c955..a44c55c955 100644
--- a/package/lua/5.3.5/0001-root-path.patch
+++ b/package/lua/5.3.6/0001-root-path.patch
diff --git a/package/lua/5.3.5/0002-shared-libs-for-lua.patch b/package/lua/5.3.6/0002-shared-libs-for-lua.patch
index 493828c9da..493828c9da 100644
--- a/package/lua/5.3.5/0002-shared-libs-for-lua.patch
+++ b/package/lua/5.3.6/0002-shared-libs-for-lua.patch
diff --git a/package/lua/5.3.5/0011-linenoise.patch b/package/lua/5.3.6/0003-linenoise.patch
index 574e6c8f0b..574e6c8f0b 100644
--- a/package/lua/5.3.5/0011-linenoise.patch
+++ b/package/lua/5.3.6/0003-linenoise.patch
diff --git a/package/lua/5.3.6/lua.hash b/package/lua/5.3.6/lua.hash
new file mode 100644
index 0000000000..74849b3101
--- /dev/null
+++ b/package/lua/5.3.6/lua.hash
@@ -0,0 +1,6 @@
+# Hashes from: http://www.lua.org/ftp/
+md5 83f23dbd5230140a3770d5f54076948d lua-5.3.6.tar.gz
+sha1 f27d20d6c81292149bc4308525a9d6733c224fa5 lua-5.3.6.tar.gz
+
+# Locally computed
+sha256 2ddff2161e0c4487d744943565538743c0721485873092f6809d072a983b06ef doc/readme.html
diff --git a/package/lua/5.4.0/0001-root-path.patch b/package/lua/5.4.2/0001-root-path.patch
index 588fecb12d..8e82c1ce59 100644
--- a/package/lua/5.4.0/0001-root-path.patch
+++ b/package/lua/5.4.2/0001-root-path.patch
@@ -6,7 +6,7 @@ Index: b/src/luaconf.h
===================================================================
--- a/src/luaconf.h
+++ b/src/luaconf.h
-@@ -227,7 +227,7 @@
+@@ -212,7 +212,7 @@
#else /* }{ */
diff --git a/package/lua/5.4.0/0002-shared-libs-for-lua.patch b/package/lua/5.4.2/0002-shared-libs-for-lua.patch
index 4ff2044298..4ff2044298 100644
--- a/package/lua/5.4.0/0002-shared-libs-for-lua.patch
+++ b/package/lua/5.4.2/0002-shared-libs-for-lua.patch
diff --git a/package/lua/5.4.0/0011-linenoise.patch b/package/lua/5.4.2/0011-linenoise.patch
index e842e5b1ef..e842e5b1ef 100644
--- a/package/lua/5.4.0/0011-linenoise.patch
+++ b/package/lua/5.4.2/0011-linenoise.patch
diff --git a/package/lua/5.4.2/lua.hash b/package/lua/5.4.2/lua.hash
new file mode 100644
index 0000000000..f916c8e4ef
--- /dev/null
+++ b/package/lua/5.4.2/lua.hash
@@ -0,0 +1,6 @@
+# Hashes from: https://www.lua.org/ftp/
+md5 49c92d6a49faba342c35c52e1ac3f81e lua-5.4.2.tar.gz
+sha1 96d4a21393c94bed286b8dc0568f4bdde8730b22 lua-5.4.2.tar.gz
+
+# Locally computed
+sha256 17bd5781d5dfa8c946fea639984fcbcb499d8bb3056a3c2cb5c15c3da5d1c207 doc/readme.html
diff --git a/package/lua/lua.hash b/package/lua/lua.hash
deleted file mode 100644
index ab72480e55..0000000000
--- a/package/lua/lua.hash
+++ /dev/null
@@ -1,11 +0,0 @@
-# Hashes from: http://www.lua.org/ftp/
-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 2e115fe26e435e33b0d5c022e4490567 lua-5.1.5.tar.gz
-sha1 b3882111ad02ecc6b972f8c1241647905cb2e3fc lua-5.1.5.tar.gz
-# Locally computed
-sha256 ee5e3e82af1e1b543c4f216e399d7c8cfee797711913f349e385101c4ae60a79 COPYRIGHT
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index ee604b6121..e3a415a06a 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -5,13 +5,13 @@
################################################################################
ifeq ($(BR2_PACKAGE_LUA_5_4),y)
-LUA_VERSION = 5.4.0
+LUA_VERSION = 5.4.2
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
-LUA_SITE = http://www.lua.org/ftp
+LUA_SITE = https://www.lua.org/ftp
LUA_INSTALL_STAGING = YES
LUA_LICENSE = MIT
ifeq ($(BR2_PACKAGE_LUA_5_3)$(BR2_PACKAGE_LUA_5_4),y)
@@ -19,6 +19,7 @@ LUA_LICENSE_FILES = doc/readme.html
else
LUA_LICENSE_FILES = COPYRIGHT
endif
+LUA_CPE_ID_VENDOR = lua
LUA_PROVIDES = luainterpreter