summaryrefslogtreecommitdiffstats
path: root/package/lua
diff options
context:
space:
mode:
authorFrancois Perrad <fperrad@gmail.com>2015-03-08 11:56:16 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-03-08 14:34:52 +0100
commit077193b6b3afb9af431d99a7a7ce5471f7a98a87 (patch)
tree726d21aa4f53b9e82ce4dfeb761f47bc486f3d98 /package/lua
parent1f361b26e8cbe5686d2a570b6cd9eeb4a7e684fe (diff)
downloadbuildroot-077193b6b3afb9af431d99a7a7ce5471f7a98a87.tar.gz
buildroot-077193b6b3afb9af431d99a7a7ce5471f7a98a87.zip
lua: bump to version 5.2.4
Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/lua')
-rw-r--r--package/lua/5.2.3/0012-fix-ephemeron-table.patch19
-rw-r--r--package/lua/5.2.4/0001-root-path.patch (renamed from package/lua/5.2.3/0001-root-path.patch)0
-rw-r--r--package/lua/5.2.4/0002-shared-libs-for-lua.patch (renamed from package/lua/5.2.3/0002-shared-libs-for-lua.patch)0
-rw-r--r--package/lua/5.2.4/0004-lua-pc.patch (renamed from package/lua/5.2.3/0004-lua-pc.patch)0
-rw-r--r--package/lua/5.2.4/0011-linenoise.patch (renamed from package/lua/5.2.3/0011-linenoise.patch)0
-rw-r--r--package/lua/lua.hash4
-rw-r--r--package/lua/lua.mk2
7 files changed, 3 insertions, 22 deletions
diff --git a/package/lua/5.2.3/0012-fix-ephemeron-table.patch b/package/lua/5.2.3/0012-fix-ephemeron-table.patch
deleted file mode 100644
index f231016922..0000000000
--- a/package/lua/5.2.3/0012-fix-ephemeron-table.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Ephemeron table can wrongly collect entry with strong key.
-
-Fetch from: http://www.lua.org/bugs.html#5.2.3-2
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/src/lgc.c
-===================================================================
---- a/src/lgc.c
-+++ b/src/lgc.c
-@@ -403,7 +403,7 @@
- reallymarkobject(g, gcvalue(gval(n))); /* mark it now */
- }
- }
-- if (prop)
-+ if (g->gcstate != GCSatomic || prop)
- linktable(h, &g->ephemeron); /* have to propagate again */
- else if (hasclears) /* does table have white keys? */
- linktable(h, &g->allweak); /* may have to clean white keys */
diff --git a/package/lua/5.2.3/0001-root-path.patch b/package/lua/5.2.4/0001-root-path.patch
index c6f242c20e..c6f242c20e 100644
--- a/package/lua/5.2.3/0001-root-path.patch
+++ b/package/lua/5.2.4/0001-root-path.patch
diff --git a/package/lua/5.2.3/0002-shared-libs-for-lua.patch b/package/lua/5.2.4/0002-shared-libs-for-lua.patch
index 3cf3b24848..3cf3b24848 100644
--- a/package/lua/5.2.3/0002-shared-libs-for-lua.patch
+++ b/package/lua/5.2.4/0002-shared-libs-for-lua.patch
diff --git a/package/lua/5.2.3/0004-lua-pc.patch b/package/lua/5.2.4/0004-lua-pc.patch
index 62acb201f2..62acb201f2 100644
--- a/package/lua/5.2.3/0004-lua-pc.patch
+++ b/package/lua/5.2.4/0004-lua-pc.patch
diff --git a/package/lua/5.2.3/0011-linenoise.patch b/package/lua/5.2.4/0011-linenoise.patch
index b1f228cd49..b1f228cd49 100644
--- a/package/lua/5.2.3/0011-linenoise.patch
+++ b/package/lua/5.2.4/0011-linenoise.patch
diff --git a/package/lua/lua.hash b/package/lua/lua.hash
index b6ac026f22..fe36dcdf60 100644
--- a/package/lua/lua.hash
+++ b/package/lua/lua.hash
@@ -2,8 +2,8 @@
md5 a1b0a7e92d0c85bbff7a8d27bf29f8af lua-5.3.0.tar.gz
sha1 1c46d1c78c44039939e820126b86a6ae12dadfba lua-5.3.0.tar.gz
-md5 dc7f94ec6ff15c985d2d6ad0f1b35654 lua-5.2.3.tar.gz
-sha1 926b7907bc8d274e063d42804666b40a3f3c124c lua-5.2.3.tar.gz
+md5 913fdb32207046b273fdb17aad70be13 lua-5.2.4.tar.gz
+sha1 ef15259421197e3d85b7d6e4871b8c26fd82c1cf lua-5.2.4.tar.gz
md5 2e115fe26e435e33b0d5c022e4490567 lua-5.1.5.tar.gz
sha1 b3882111ad02ecc6b972f8c1241647905cb2e3fc lua-5.1.5.tar.gz
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index f008d3495a..bb5741d6c8 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -8,7 +8,7 @@ ifeq ($(BR2_PACKAGE_LUA_5_3),y)
LUA_VERSION = 5.3.0
else
ifeq ($(BR2_PACKAGE_LUA_5_2),y)
-LUA_VERSION = 5.2.3
+LUA_VERSION = 5.2.4
else
LUA_VERSION = 5.1.5
endif
OpenPOWER on IntegriCloud