luafilesystem: remove LARGE_FILE constraint

Add a patch to luafilesystem so that it builds correctly when large
files are not supported. This allows to remove the dependency of
luafilesystem on large file support on the toolchain. Packages such as
cgilua, wsapi and xavante, which depend on luafilesystem, also get
their dependency on large file support removed.

Fixes bug #2359.

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
This commit is contained in:
Francois Perrad 2010-08-05 16:36:34 +02:00 committed by Thomas Petazzoni
parent 66ab676616
commit e6c4ce6cef
6 changed files with 26 additions and 18 deletions

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_CGILUA
bool "cgilua"
depends on BR2_LARGEFILE
select BR2_PACKAGE_LUA_SHARED_LIBRARY
select BR2_PACKAGE_LUAFILESYSTEM
help
@ -8,6 +7,3 @@ config BR2_PACKAGE_CGILUA
and manipulating input data from Web forms.
http://luaforge.net/projects/cgilua/
comment "cgilua requires a toolchain with LARGEFILE support"
depends on !BR2_LARGEFILE

View File

@ -1,12 +1,8 @@
config BR2_PACKAGE_LUAFILESYSTEM
bool "luafilesystem"
depends on BR2_LARGEFILE
select BR2_PACKAGE_LUA_SHARED_LIBRARY
help
LuaFileSystem offers a portable way to access
the underlying directory structure and file attributes.
http://luaforge.net/projects/luafilesystem/
comment "luafilesystem requires a toolchain with LARGEFILE support"
depends on !BR2_LARGEFILE
http://keplerproject.github.com/luafilesystem/

View File

@ -0,0 +1,20 @@
diff --git a/src/lfs.c b/src/lfs.c
index 85f01e3..ed49f50 100644
--- a/src/lfs.c
+++ b/src/lfs.c
@@ -22,13 +22,13 @@
#ifndef _WIN32
#ifndef _AIX
-#define _FILE_OFFSET_BITS 64 /* Linux, Solaris and HP-UX */
+//#define _FILE_OFFSET_BITS 64 /* Linux, Solaris and HP-UX */
#else
#define _LARGE_FILES 1 /* AIX */
#endif
#endif
-#define _LARGEFILE64_SOURCE
+//#define _LARGEFILE64_SOURCE
#include <errno.h>
#include <stdio.h>

View File

@ -8,8 +8,12 @@ LUAFILESYSTEM_VERSION = 1.5.0
LUAFILESYSTEM_SITE = http://github.com/downloads/keplerproject/luafilesystem
LUAFILESYSTEM_DEPENDENCIES = lua
ifeq ($(BR2_LARGEFILE),y)
LFS_CFLAGS = -D_FILE_OFFSET_BITS=64 _LARGEFILE64_SOURCE
endif
define LUAFILESYSTEM_BUILD_CMDS
$(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -fPIC"
$(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) $(LFS_CFLAGS) -fPIC"
endef
define LUAFILESYSTEM_INSTALL_TARGET_CMDS

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_WSAPI
bool "wsapi"
depends on BR2_LARGEFILE # luafilesystem
select BR2_PACKAGE_COXPCALL
select BR2_PACKAGE_LUAFILESYSTEM
select BR2_PACKAGE_RINGS
@ -8,6 +7,3 @@ config BR2_PACKAGE_WSAPI
API that abstracts the web server from Lua web applications.
http://keplerproject.github.com/wsapi/
comment "wsapi requires a toolchain with LARGEFILE support"
depends on !BR2_LARGEFILE

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_XAVANTE
bool "xavante"
depends on BR2_LARGEFILE # luafilesystem
select BR2_PACKAGE_LUA_SHARED_LIBRARY
select BR2_PACKAGE_CGILUA
select BR2_PACKAGE_COPAS
@ -13,6 +12,3 @@ config BR2_PACKAGE_XAVANTE
architecture based on URI mapped handlers.
http://keplerproject.github.com/xavante/
comment "xavante requires a toolchain with LARGEFILE support"
depends on !BR2_LARGEFILE