Skip to content

Commit 77e89dc

Browse files
authored
[Lua] Update to 5.5.0 (#12843)
1 parent 27c9de1 commit 77e89dc

File tree

4 files changed

+23
-20
lines changed

4 files changed

+23
-20
lines changed

L/Lua/build_tarballs.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using BinaryBuilder
22

33
name = "Lua"
4-
version = v"5.4.8"
5-
ygg_version = v"5.4.9" # Got out of sync when RISC-V was added
4+
version = v"5.5.0"
5+
ygg_version = v"5.5.0"
66

77
sources = [
88
ArchiveSource("https://www.lua.org/ftp/lua-$(version).tar.gz",
9-
"4f18ddae154e793e46eeab727c59ef1c0c0c2b744e7b94219710d76f530629ae"),
9+
"57ccc32bbbd005cab75bcc52444052535af691789dba2b9016d5c50640d68b3d"),
1010
DirectorySource("./bundled"),
1111
]
1212

@@ -32,7 +32,7 @@ fi
3232
# XXX: Work around Lua apparently not understanding its own Windows setup
3333
if [[ ${target} == *-mingw* ]]; then
3434
TO_BIN="lua.exe luac.exe"
35-
TO_LIB="lua54.dll"
35+
TO_LIB="lua55.dll"
3636
else
3737
TO_BIN="lua luac"
3838
TO_LIB="liblua.${dlext}"
@@ -49,7 +49,7 @@ platforms = supported_platforms()
4949
products = [
5050
ExecutableProduct("lua", :lua),
5151
ExecutableProduct("luac", :luac),
52-
LibraryProduct(["liblua", "lua54"], :liblua),
52+
LibraryProduct(["liblua", "lua55"], :liblua),
5353
]
5454

5555
dependencies = [

L/Lua/bundled/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ requirement is that if you do use Lua, then you should give us credit
77
by including the appropriate copyright notice somewhere in your
88
product or its documentation.
99

10-
Copyright © 1994–2019 Lua.org, PUC-Rio.
10+
Copyright © 1994–2025 Lua.org, PUC-Rio.
1111

1212
Permission is hereby granted, free of charge, to any person
1313
obtaining a copy of this software and associated documentation

L/Lua/bundled/patches/src_Makefile.patch

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,35 @@ index b771196..227243a 100644
77
PLAT= guess
88

99
-CC= gcc -std=gnu99
10-
-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)
10+
-CFLAGS= -O2 -Wall -Wextra $(SYSCFLAGS) $(MYCFLAGS)
1111
+CC?= gcc -std=gnu99
12-
+CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) -fPIC
12+
+CFLAGS= -O2 -Wall -Wextra $(SYSCFLAGS) $(MYCFLAGS) -fPIC
1313
LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
1414
LIBS= -lm $(SYSLIBS) $(MYLIBS)
1515

16-
@@ -28,11 +28,18 @@ MYOBJS=
17-
# Special flags for compiler modules; -Os reduces code size.
18-
CMCFLAGS=
16+
@@ -26,13 +26,20 @@
17+
MYOBJS=
1918

19+
# Special flags for compiler modules; -Os reduces code size.
20+
-CMCFLAGS=
21+
+CMCFLAGS=
22+
+
2023
+ifeq ($(DLEXT),dylib)
2124
+SOFLAGS := -dynamiclib
2225
+else
2326
+SOFLAGS := -shared
2427
+endif
25-
+
28+
2629
# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
2730

28-
PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris
31+
PLATS= guess aix bsd c89 freebsd generic ios linux macosx mingw posix solaris
2932

3033
LUA_A= liblua.a
3134
+LUA_SO= liblua.$(DLEXT)
3235
CORE_O= lapi.o lcode.o lctype.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
3336
LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
3437
BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
35-
@@ -44,7 +51,7 @@ LUAC_T= luac
38+
@@ -44,7 +51,7 @@
3639
LUAC_O= luac.o
3740

3841
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
@@ -41,7 +44,7 @@ index b771196..227243a 100644
4144
ALL_A= $(LUA_A)
4245

4346
# Targets start here.
44-
@@ -60,6 +67,9 @@ $(LUA_A): $(BASE_O)
47+
@@ -60,6 +67,9 @@
4548
$(AR) $@ $(BASE_O)
4649
$(RANLIB) $@
4750

@@ -51,12 +54,12 @@ index b771196..227243a 100644
5154
$(LUA_T): $(LUA_O) $(LUA_A)
5255
$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
5356

54-
@@ -129,7 +139,7 @@ linux-readline:
55-
$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX -DLUA_USE_READLINE" SYSLIBS="-Wl,-E -ldl -lreadline"
57+
@@ -124,7 +134,7 @@
58+
$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl"
5659

5760
Darwin macos macosx:
5861
- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX -DLUA_USE_READLINE" SYSLIBS="-lreadline"
5962
+ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX -DLUA_USE_READLINE -fno-common" SYSLIBS="-lreadline"
6063

6164
mingw:
62-
$(MAKE) "LUA_A=lua54.dll" "LUA_T=lua.exe" \
65+
$(MAKE) "LUA_A=lua55.dll" "LUA_T=lua.exe" \

L/Lua/bundled/patches/src_lauxlib.c.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ diff --git a/src/lauxlib.c b/src/lauxlib.c
22
index 4ca6c65..146cb75 100644
33
--- a/src/lauxlib.c
44
+++ b/src/lauxlib.c
5-
@@ -1110,3 +1110,13 @@ LUALIB_API void luaL_checkversion_ (lua_State *L, lua_Number ver, size_t sz) {
5+
@@ -1199,3 +1199,13 @@ LUALIB_API void luaL_checkversion_ (lua_State *L, lua_Number ver, size_t sz) {
66
(LUAI_UACNUMBER)ver, (LUAI_UACNUMBER)v);
77
}
8-
8+
99
+
1010
+/* Julia-specific extensions for accessing configuration parameters */
1111
+

0 commit comments

Comments
 (0)