diff options
-rw-r--r-- | package/cgilua/Config.in | 4 | ||||
-rw-r--r-- | package/luafilesystem/Config.in | 6 | ||||
-rw-r--r-- | package/luafilesystem/luafilesystem-without_large_file.patch | 20 | ||||
-rw-r--r-- | package/luafilesystem/luafilesystem.mk | 6 | ||||
-rw-r--r-- | package/wsapi/Config.in | 4 | ||||
-rw-r--r-- | package/xavante/Config.in | 4 |
6 files changed, 26 insertions, 18 deletions
diff --git a/package/cgilua/Config.in b/package/cgilua/Config.in index a74e49f53..b43ba97d1 100644 --- a/package/cgilua/Config.in +++ b/package/cgilua/Config.in @@ -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 diff --git a/package/luafilesystem/Config.in b/package/luafilesystem/Config.in index 6cb6c2475..edcb414a9 100644 --- a/package/luafilesystem/Config.in +++ b/package/luafilesystem/Config.in @@ -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/ diff --git a/package/luafilesystem/luafilesystem-without_large_file.patch b/package/luafilesystem/luafilesystem-without_large_file.patch new file mode 100644 index 000000000..b1f41c09d --- /dev/null +++ b/package/luafilesystem/luafilesystem-without_large_file.patch @@ -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> diff --git a/package/luafilesystem/luafilesystem.mk b/package/luafilesystem/luafilesystem.mk index a27080cd6..e68873414 100644 --- a/package/luafilesystem/luafilesystem.mk +++ b/package/luafilesystem/luafilesystem.mk @@ -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 diff --git a/package/wsapi/Config.in b/package/wsapi/Config.in index 472bbfcee..362164848 100644 --- a/package/wsapi/Config.in +++ b/package/wsapi/Config.in @@ -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 diff --git a/package/xavante/Config.in b/package/xavante/Config.in index a1b47c33b..a7df53021 100644 --- a/package/xavante/Config.in +++ b/package/xavante/Config.in @@ -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 |