NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/civetweb: fix build with Lua 5.1

Browse Source 
Fix the following build failure with Lua 5.1 raised since bump to
version 1.16 in commit fcc4ea595a and
82ba5a04c9:

/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 <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2023-11-06 21:47:15 +01:00 committed by Thomas Petazzoni
parent 4ec5e32762
commit 55fd656cb2
1 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
package/civetweb/0001-resources-Makefile.in-lua-fix-build-with-Lua-5.1.patch Normal file
View File

@ -0,0 +1,44 @@
From 3afcd237e509a6700c449056dcc5b9092af31e6a Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
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 <fontaine.fabrice@gmail.com>
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