diff options
| author | Caleb Maclennan <caleb@alerque.com> | 2026-08-31 18:21:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-08-31 17:21:20 +0200 |
| commit | fa9b35a0cf11bc856cbd8bffbef5ad6fb3e62a93 (patch) | |
| tree | ee7bde0e0d61fc837e426b7f49199a807b6b08aa | |
| parent | eb47ded0023257b1b5b29314dd1b584e44455a01 (diff) | |
| download | luasocket-fa9b35a0cf11bc856cbd8bffbef5ad6fb3e62a93.tar.gz luasocket-fa9b35a0cf11bc856cbd8bffbef5ad6fb3e62a93.tar.bz2 luasocket-fa9b35a0cf11bc856cbd8bffbef5ad6fb3e62a93.zip | |
Add Lua 5.5 support (#473)
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | docs/index.html | 2 | ||||
| -rw-r--r-- | makefile | 8 | ||||
| -rw-r--r-- | src/makefile | 4 |
5 files changed, 12 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22ce0c6..96564fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml | |||
| @@ -12,7 +12,7 @@ jobs: | |||
| 12 | strategy: | 12 | strategy: |
| 13 | fail-fast: false | 13 | fail-fast: false |
| 14 | matrix: | 14 | matrix: |
| 15 | luaVersion: [ "5.4", "5.3", "5.2", "5.1", "luajit", "luajit-openresty" ] | 15 | luaVersion: [ "5.5", "5.4", "5.3", "5.2", "5.1", "luajit", "luajit-openresty" ] |
| 16 | platform: [ "ubuntu-22.04", "macos-14", "windows-2022" ] | 16 | platform: [ "ubuntu-22.04", "macos-14", "windows-2022" ] |
| 17 | runs-on: ${{ matrix.platform }} | 17 | runs-on: ${{ matrix.platform }} |
| 18 | steps: | 18 | steps: |
diff --git a/CHANGELOG.md b/CHANGELOG.md index a287d8b..8706705 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | * Pass correct path length for abstract Unix sockets – @Zash | 21 | * Pass correct path length for abstract Unix sockets – @Zash |
| 22 | * Return immediately, not block, when asked to receive 0 – @Tieske | 22 | * Return immediately, not block, when asked to receive 0 – @Tieske |
| 23 | * Properly format IPv6 addresses with brackets in host header – @Tieske | 23 | * Properly format IPv6 addresses with brackets in host header – @Tieske |
| 24 | * Document support for Lua 5.5 (no code changes) – @alerque | ||
| 24 | 25 | ||
| 25 | ## [v3.1.0](https://github.com/lunarmodules/luasocket/releases/v3.1.0) — 2022-07-27 | 26 | ## [v3.1.0](https://github.com/lunarmodules/luasocket/releases/v3.1.0) — 2022-07-27 |
| 26 | 27 | ||
diff --git a/docs/index.html b/docs/index.html index ad92687..3341f8d 100644 --- a/docs/index.html +++ b/docs/index.html | |||
| @@ -88,7 +88,7 @@ Author: <a href="http://www.impa.br/~diego">Diego Nehab</a> | |||
| 88 | 88 | ||
| 89 | <p> | 89 | <p> |
| 90 | LuaSocket version 3.1.0 is now available for download! | 90 | LuaSocket version 3.1.0 is now available for download! |
| 91 | It is compatible with Lua 5.1 through 5.4. | 91 | It is compatible with Lua 5.1 through 5.5. |
| 92 | Chances are it works well on most UNIX distributions and Windows flavors. | 92 | Chances are it works well on most UNIX distributions and Windows flavors. |
| 93 | </p> | 93 | </p> |
| 94 | 94 | ||
| @@ -5,7 +5,7 @@ | |||
| 5 | # Targets: | 5 | # Targets: |
| 6 | # install install system independent support | 6 | # install install system independent support |
| 7 | # install-unix also install unix-only support | 7 | # install-unix also install unix-only support |
| 8 | # install-both install for lua51 lua52 lua53 | 8 | # install-both install for lua51 lua52 lua53 lua54 lua55 |
| 9 | # install-both-unix also install unix-only | 9 | # install-both-unix also install unix-only |
| 10 | # print print the build settings | 10 | # print print the build settings |
| 11 | 11 | ||
| @@ -36,6 +36,9 @@ install-both: | |||
| 36 | $(MAKE) clean | 36 | $(MAKE) clean |
| 37 | @cd src; $(MAKE) $(PLAT) LUAV=5.4 | 37 | @cd src; $(MAKE) $(PLAT) LUAV=5.4 |
| 38 | @cd src; $(MAKE) install LUAV=5.4 | 38 | @cd src; $(MAKE) install LUAV=5.4 |
| 39 | $(MAKE) clean | ||
| 40 | @cd src; $(MAKE) $(PLAT) LUAV=5.5 | ||
| 41 | @cd src; $(MAKE) install LUAV=5.5 | ||
| 39 | 42 | ||
| 40 | install-both-unix: | 43 | install-both-unix: |
| 41 | $(MAKE) clean | 44 | $(MAKE) clean |
| @@ -50,6 +53,9 @@ install-both-unix: | |||
| 50 | $(MAKE) clean | 53 | $(MAKE) clean |
| 51 | @cd src; $(MAKE) $(PLAT) LUAV=5.4 | 54 | @cd src; $(MAKE) $(PLAT) LUAV=5.4 |
| 52 | @cd src; $(MAKE) install-unix LUAV=5.4 | 55 | @cd src; $(MAKE) install-unix LUAV=5.4 |
| 56 | $(MAKE) clean | ||
| 57 | @cd src; $(MAKE) $(PLAT) LUAV=5.5 | ||
| 58 | @cd src; $(MAKE) install-unix LUAV=5.5 | ||
| 53 | 59 | ||
| 54 | .PHONY: test | 60 | .PHONY: test |
| 55 | 61 | ||
diff --git a/src/makefile b/src/makefile index 868f98c..310fe4e 100644 --- a/src/makefile +++ b/src/makefile | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | # platform to build for | 16 | # platform to build for |
| 17 | PLAT?=linux | 17 | PLAT?=linux |
| 18 | 18 | ||
| 19 | # LUAV: 5.1 5.2 5.3 5.4 | 19 | # LUAV: 5.1 5.2 5.3 5.4 5.5 |
| 20 | # lua version to build against | 20 | # lua version to build against |
| 21 | LUAV?=5.1 | 21 | LUAV?=5.1 |
| 22 | 22 | ||
| @@ -234,7 +234,7 @@ O_ucrt64=o | |||
| 234 | CC_ucrt64=gcc | 234 | CC_ucrt64=gcc |
| 235 | DEF_ucrt64= -DLUASOCKET_$(DEBUG) \ | 235 | DEF_ucrt64= -DLUASOCKET_$(DEBUG) \ |
| 236 | -DWINVER=0x0501 | 236 | -DWINVER=0x0501 |
| 237 | CFLAGS_ucrt64= -I$(LUAINC) $(DEF) -Wall -O2 -fno-common | 237 | CFLAGS_ucrt64= -I$(LUAINC) $(DEF) -Wall -O2 -fno-common |
| 238 | # \ | 238 | # \ |
| 239 | -fvisibility=hidden | 239 | -fvisibility=hidden |
| 240 | LDFLAGS_ucrt64= $(LUALIB) -shared -Wl,-s -lws2_32 -o | 240 | LDFLAGS_ucrt64= $(LUALIB) -shared -Wl,-s -lws2_32 -o |
