Commit e6c4ce6c authored by Francois Perrad's avatar Francois Perrad Committed by Thomas Petazzoni
Browse files

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: default avatarFrancois Perrad <francois.perrad@gadz.org>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
parent 66ab6766

package/cgilua/Config.in

+0 −4
Original line number Diff line number Diff line 
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

package/luafilesystem/Config.in

+1 −5
Original line number Diff line number Diff line 
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/

package/luafilesystem/luafilesystem-without_large_file.patch

0 → 100644
+20 −0
Original line number Diff line number Diff line 
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>

package/luafilesystem/luafilesystem.mk

+5 −1
Original line number Diff line number Diff line
@@ -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

package/wsapi/Config.in

+0 −4
Original line number Diff line number Diff line 
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