From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 17/20] luafilesystem: remove LARGE_FILE constraint
Date: Sun, 22 Aug 2010 12:52:09 +0200 [thread overview]
Message-ID: <091c73280af8c863677829024ad667d22ed43161.1282471311.git.thomas.petazzoni@free-electrons.com> (raw)
In-Reply-To: <cover.1282471311.git.thomas.petazzoni@free-electrons.com>
From: Francois Perrad <francois.perrad@gadz.org>
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>
---
package/cgilua/Config.in | 4 ----
package/luafilesystem/Config.in | 6 +-----
.../luafilesystem-without_large_file.patch | 20 ++++++++++++++++++++
package/luafilesystem/luafilesystem.mk | 6 +++++-
package/wsapi/Config.in | 4 ----
package/xavante/Config.in | 4 ----
6 files changed, 26 insertions(+), 18 deletions(-)
create mode 100644 package/luafilesystem/luafilesystem-without_large_file.patch
diff --git a/package/cgilua/Config.in b/package/cgilua/Config.in
index a74e49f..b43ba97 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 6cb6c24..edcb414 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 0000000..b1f41c0
--- /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 a27080c..e688734 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 472bbfc..3621648 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 a1b47c3..a7df530 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
--
1.7.0.4
next prev parent reply other threads:[~2010-08-22 10:52 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-22 10:51 [Buildroot] [pull request] Pull request for branch for-2010.08 Thomas Petazzoni
2010-08-22 10:51 ` [Buildroot] [PATCH 01/20] Fix util-linux build on MIPS Thomas Petazzoni
2010-08-22 10:51 ` [Buildroot] [PATCH 02/20] Add dependency from util-linux on ncurses Thomas Petazzoni
2010-08-22 10:51 ` [Buildroot] [PATCH 03/20] Make uClibc gen_wc8bit shows an error when no locale support available Thomas Petazzoni
2010-08-22 10:51 ` [Buildroot] [PATCH 04/20] Detect early if an UTF-8 locale is needed Thomas Petazzoni
2010-08-22 10:51 ` [Buildroot] [PATCH 05/20] Add the traditional powerpc-link-with-math-lib patch to gcc 4.4.4 Thomas Petazzoni
2010-08-22 10:51 ` [Buildroot] [PATCH 06/20] Mark CRIS architecture as deprecated Thomas Petazzoni
2010-08-22 10:51 ` [Buildroot] [PATCH 07/20] Prevent C++ + locale + uClibc 0.9.31 + gcc 4.2 to be selected Thomas Petazzoni
2010-08-22 10:52 ` [Buildroot] [PATCH 08/20] Update busybox 1.17.1 fixes Thomas Petazzoni
2010-08-22 10:52 ` [Buildroot] [PATCH 09/20] imagemagick: don't create useless debugging file Thomas Petazzoni
2010-08-22 10:52 ` [Buildroot] [PATCH 10/20] libglib2: add patch to rework clock_gettime() test Thomas Petazzoni
2010-08-23 5:42 ` Peter Korsgaard
2010-08-24 7:33 ` Thomas Petazzoni
2010-08-22 10:52 ` [Buildroot] [PATCH 11/20] lzo: fix host-lzo build failure when config cache is filled Thomas Petazzoni
2010-08-22 10:52 ` [Buildroot] [PATCH 12/20] Bump stable kernel headers Thomas Petazzoni
2010-08-22 10:52 ` [Buildroot] [PATCH 13/20] Security bump php to 5.2.14 Thomas Petazzoni
2010-08-22 10:52 ` [Buildroot] [PATCH 14/20] netcat: prevent build system from adding a prefix to binaries Thomas Petazzoni
2010-08-23 15:34 ` Peter Korsgaard
2010-08-24 7:31 ` Thomas Petazzoni
2010-08-22 10:52 ` [Buildroot] [PATCH 15/20] libxml-parser-perl/intltool: mark as host only packages Thomas Petazzoni
2010-08-22 10:52 ` [Buildroot] [PATCH 16/20] Add new patches Lua upstream patches rename old ones Thomas Petazzoni
2010-08-22 10:52 ` Thomas Petazzoni [this message]
2010-08-22 10:52 ` [Buildroot] [PATCH 18/20] lua: make sure that CFLAGS are passed Thomas Petazzoni
2010-08-22 10:52 ` [Buildroot] [PATCH 19/20] sysvinit: make sure to link against libcrypt Thomas Petazzoni
2010-08-22 10:52 ` [Buildroot] [PATCH 20/20] sysvinit: remove unneeded dependency on ncurses Thomas Petazzoni
2010-08-22 19:52 ` [Buildroot] [pull request] Pull request for branch for-2010.08 Peter Korsgaard
2010-08-25 15:12 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=091c73280af8c863677829024ad667d22ed43161.1282471311.git.thomas.petazzoni@free-electrons.com \
--to=thomas.petazzoni@free-electrons.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.