From 55fd656cb29eec570f2f59764454e0e9a29d432a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 6 Nov 2023 21:47:15 +0100 Subject: [PATCH] package/civetweb: fix build with Lua 5.1 Fix the following build failure with Lua 5.1 raised since bump to version 1.16 in commit fcc4ea595a07f47c86f4d52084dc1317473d2f40 and https://github.com/civetweb/civetweb/commit/82ba5a04c9a1ca980d8dfe00c18e086017e8ab25: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-gnu/13.2.0/../../../../sh4-buildroot-linux-gnu/bin/ld: out/src/third_party/lua_struct.o: in function `luaopen_struct': lua_struct.c:(.text+0xce4): undefined reference to `luaL_newlib' Fixes: - http://autobuild.buildroot.org/results/7459b504e52f473c5830c0f3c7bffd037f6e1770 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...kefile.in-lua-fix-build-with-Lua-5.1.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/civetweb/0001-resources-Makefile.in-lua-fix-build-with-Lua-5.1.patch diff --git a/package/civetweb/0001-resources-Makefile.in-lua-fix-build-with-Lua-5.1.patch b/package/civetweb/0001-resources-Makefile.in-lua-fix-build-with-Lua-5.1.patch new file mode 100644 index 0000000000..ac9655caf5 --- /dev/null +++ b/package/civetweb/0001-resources-Makefile.in-lua-fix-build-with-Lua-5.1.patch @@ -0,0 +1,44 @@ +From 3afcd237e509a6700c449056dcc5b9092af31e6a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 6 Nov 2023 21:38:02 +0100 +Subject: [PATCH] resources/Makefile.in-lua: fix build with Lua 5.1 + +Fix the following build failure with Lua 5.1 raised since version 1.16 +and +https://github.com/civetweb/civetweb/commit/82ba5a04c9a1ca980d8dfe00c18e086017e8ab25: + +/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-gnu/13.2.0/../../../../sh4-buildroot-linux-gnu/bin/ld: out/src/third_party/lua_struct.o: in function `luaopen_struct': +lua_struct.c:(.text+0xce4): undefined reference to `luaL_newlib' + +Fixes: + - http://autobuild.buildroot.org/results/7459b504e52f473c5830c0f3c7bffd037f6e1770 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/civetweb/civetweb/pull/1211 +--- + resources/Makefile.in-lua | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/resources/Makefile.in-lua b/resources/Makefile.in-lua +index d3038f66..45f80181 100644 +--- a/resources/Makefile.in-lua ++++ b/resources/Makefile.in-lua +@@ -150,6 +150,7 @@ CFLAGS += -DUSE_LUA_FILE_SYSTEM + #SOURCE_DIRS = $(LFS_DIR) + + ++ifneq ($(WITH_LUA_VERSION), 501) + LXX_DIR = src/third_party + LXX_SOURCE_FILES = lua_struct.c + LXX_SOURCES = $(addprefix $(LXX_DIR)/, $(LXX_SOURCE_FILES)) +@@ -159,6 +160,7 @@ OBJECTS += $(LXX_OBJECTS) + CFLAGS += $(LXX_CFLAGS) + CFLAGS += -DUSE_LUA_STRUCT + #SOURCE_DIRS = $(LXX_DIR) ++endif + + + ifneq ($(WITH_LUA_VERSION), 501) +-- +2.42.0 +