diff mbox

lighttpd: requires a Lua 5.1.x

Message ID 1453030107-7010-1-git-send-email-francois.perrad@gadz.org
State Changes Requested
Headers show

Commit Message

Francois Perrad Jan. 17, 2016, 11:28 a.m. UTC
see failure in http://autobuild.buildroot.net/results/13f/13faa9ebce00359b8943775364a432ce422fe8b8/

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/lighttpd/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Peter Korsgaard Jan. 18, 2016, 7:01 p.m. UTC | #1
>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:

 > see failure in http://autobuild.buildroot.net/results/13f/13faa9ebce00359b8943775364a432ce422fe8b8/
 > Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

How about we instead backport r3070, which afaik should be included in
the next release:

https://redmine.lighttpd.net/issues/2674
Francois Perrad Jan. 18, 2016, 8:16 p.m. UTC | #2
Peter,

I try this patch, it fixes only the file src/mod_magnet.c,
but it doesn't fix the compilation of src/mod_cml_lua.c

ibtool: compile:
/home/user/build/sourcery/host/usr/bin/arm-none-linux-gnueabi-gcc
-DHAVE_CONFIG_H -DHAVE_VERSION_H -DLIBRARY_DIR=\"/usr/lib/lighttpd\"
-DSBIN_DIR=\"/usr/sbin\" -I. -I.. -D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_REENTRANT
-D__EXTENSIONS__ -DOPENSSL_NO_KRB5 -D_FILE_OFFSET_BITS=64
-D_LARGEFILE_SOURCE -D_LARGE_FILES
-I/home/user/build/sourcery/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include
-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os
-Wall -W -Wshadow -pedantic -std=gnu99 -c mod_cml_funcs.c  -fPIC -DPIC
-o .libs/mod_cml_la-mod_cml_funcs.o
mod_cml_lua.c: In function 'lua_to_c_get_string':
mod_cml_lua.c:54:18: error: 'LUA_GLOBALSINDEX' undeclared (first use
in this function)
  lua_gettable(L, LUA_GLOBALSINDEX);
                  ^
mod_cml_lua.c:54:18: note: each undeclared identifier is reported only
once for each function it appears in
mod_cml_lua.c: In function 'lua_to_c_is_table':
mod_cml_lua.c:78:18: error: 'LUA_GLOBALSINDEX' undeclared (first use
in this function)
  lua_gettable(L, LUA_GLOBALSINDEX);
                  ^
mod_cml_lua.c: In function 'cache_parse_lua':
mod_cml_lua.c:254:18: error: 'LUA_GLOBALSINDEX' undeclared (first use
in this function)
  lua_settable(L, LUA_GLOBALSINDEX);
                  ^
mod_cml_lua.c:294:2: error: too few arguments to function 'lua_load'
  if (lua_load(L, load_file, &rm, fn->ptr) || lua_pcall(L,0,1,0)) {
  ^
In file included from mod_cml_funcs.h:9:0,
                 from mod_cml_lua.c:2:
/home/user/build/sourcery/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/lua.h:261:16:
note: declared here
 LUA_API int   (lua_load) (lua_State *L, lua_Reader reader, void *dt,
                ^
Makefile:1635: recipe for target 'mod_cml_la-mod_cml_lua.lo' failed


François

2016-01-18 20:01 GMT+01:00 Peter Korsgaard <peter@korsgaard.com>:
>>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:
>
>  > see failure in http://autobuild.buildroot.net/results/13f/13faa9ebce00359b8943775364a432ce422fe8b8/
>  > Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
>
> How about we instead backport r3070, which afaik should be included in
> the next release:
>
> https://redmine.lighttpd.net/issues/2674
>
> --
> Bye, Peter Korsgaard
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Peter Korsgaard Jan. 18, 2016, 8:34 p.m. UTC | #3
>>>>> "François" == François Perrad <francois.perrad@gadz.org> writes:

 > Peter,
 > I try this patch, it fixes only the file src/mod_magnet.c,
 > but it doesn't fix the compilation of src/mod_cml_lua.c

 > ibtool: compile:
 > /home/user/build/sourcery/host/usr/bin/arm-none-linux-gnueabi-gcc
 > -DHAVE_CONFIG_H -DHAVE_VERSION_H -DLIBRARY_DIR=\"/usr/lib/lighttpd\"
 > -DSBIN_DIR=\"/usr/sbin\" -I. -I.. -D_LARGEFILE_SOURCE
 > -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_REENTRANT
 > -D__EXTENSIONS__ -DOPENSSL_NO_KRB5 -D_FILE_OFFSET_BITS=64
 > -D_LARGEFILE_SOURCE -D_LARGE_FILES
 > -I/home/user/build/sourcery/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include
 > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os
 > -Wall -W -Wshadow -pedantic -std=gnu99 -c mod_cml_funcs.c  -fPIC -DPIC
 > -o .libs/mod_cml_la-mod_cml_funcs.o
 > mod_cml_lua.c: In function 'lua_to_c_get_string':
 > mod_cml_lua.c:54:18: error: 'LUA_GLOBALSINDEX' undeclared (first use
 > in this function)
 >   lua_gettable(L, LUA_GLOBALSINDEX);

Hmm, are you sure you applied the patch correctly?

From the diff, it seems like you didn't patch mod_cml_lua.c:

https://redmine.lighttpd.net/projects/lighttpd/repository/revisions/3070/diff/branches/lighttpd-1.4.x/src/mod_cml_lua.c?utf8=%E2%9C%93&type=sbs
Francois Perrad Jan. 19, 2016, 7:02 p.m. UTC | #4
2016-01-18 21:34 GMT+01:00 Peter Korsgaard <peter@korsgaard.com>:
>>>>>> "François" == François Perrad <francois.perrad@gadz.org> writes:
>
>  > Peter,
>  > I try this patch, it fixes only the file src/mod_magnet.c,
>  > but it doesn't fix the compilation of src/mod_cml_lua.c
>
>  > ibtool: compile:
>  > /home/user/build/sourcery/host/usr/bin/arm-none-linux-gnueabi-gcc
>  > -DHAVE_CONFIG_H -DHAVE_VERSION_H -DLIBRARY_DIR=\"/usr/lib/lighttpd\"
>  > -DSBIN_DIR=\"/usr/sbin\" -I. -I.. -D_LARGEFILE_SOURCE
>  > -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_REENTRANT
>  > -D__EXTENSIONS__ -DOPENSSL_NO_KRB5 -D_FILE_OFFSET_BITS=64
>  > -D_LARGEFILE_SOURCE -D_LARGE_FILES
>  > -I/home/user/build/sourcery/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include
>  > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os
>  > -Wall -W -Wshadow -pedantic -std=gnu99 -c mod_cml_funcs.c  -fPIC -DPIC
>  > -o .libs/mod_cml_la-mod_cml_funcs.o
>  > mod_cml_lua.c: In function 'lua_to_c_get_string':
>  > mod_cml_lua.c:54:18: error: 'LUA_GLOBALSINDEX' undeclared (first use
>  > in this function)
>  >   lua_gettable(L, LUA_GLOBALSINDEX);
>
> Hmm, are you sure you applied the patch correctly?
>
> From the diff, it seems like you didn't patch mod_cml_lua.c:
>
> https://redmine.lighttpd.net/projects/lighttpd/repository/revisions/3070/diff/branches/lighttpd-1.4.x/src/mod_cml_lua.c?utf8=%E2%9C%93&type=sbs
>
> --
> Venlig hilsen,
> Peter Korsgaard

You're right, I use the patch in the ticket instead of the commit r3070.
Now working.

François
diff mbox

Patch

diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in
index f62ccb9..2ae4e1e 100644
--- a/package/lighttpd/Config.in
+++ b/package/lighttpd/Config.in
@@ -52,7 +52,7 @@  config BR2_PACKAGE_LIGHTTPD_WEBDAV
 
 config BR2_PACKAGE_LIGHTTPD_LUA
 	bool "lua support"
-	depends on BR2_PACKAGE_LUA
+	depends on BR2_PACKAGE_LUA_5_1
 	help
 	  Enable Lua support. Needed to support mod_magnet