aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/e2fsprogs
diff options
context:
space:
mode:
authorGraham Gower <graham.gower@gmail.com>2010-12-01 13:31:40 +1030
committerStefan Schmidt <stefan@buglabs.net>2010-12-02 16:47:19 +0100
commita6fa89dedf706d3d2eb6692db18cd0c35528d357 (patch)
treea4f668029678d6988384e5b8a8424836394be30a /recipes/e2fsprogs
parentf6c853348a57c001f509ba0aeaace9dbd75c48ab (diff)
downloadopenembedded-a6fa89dedf706d3d2eb6692db18cd0c35528d357.tar.gz
e2fsprogs_1.41.9.bb: Fix build for uclibc when DISTRO_FEATURES lacks largefile.
CC llseek.c llseek.c:65:22: error: expected declaration specifiers or '...' before '_llseek' llseek.c:65:43: error: expected declaration specifiers or '...' before 'fd' llseek.c:65:60: error: expected declaration specifiers or '...' before 'offset_high' llseek.c:66:19: error: expected declaration specifiers or '...' before 'offset_low' llseek.c:66:44: error: expected declaration specifiers or '...' before 'result' llseek.c:67:18: error: expected declaration specifiers or '...' before 'origin' llseek.c: In function '_syscall5': llseek.c:71:1: error: expected '=', ',', ';', 'asm' or '__attribute__' before '{' token llseek.c:91:1: error: expected '=', ',', ';', 'asm' or '__attribute__' before '{' token llseek.c:65:1: error: parameter name omitted llseek.c:65:22: error: parameter name omitted llseek.c:65:43: error: parameter name omitted llseek.c:66:4: error: parameter name omitted llseek.c:66:19: error: parameter name omitted llseek.c:67:4: error: parameter name omitted llseek.c:114:1: error: expected '{' at end of input make[2]: *** [llseek.o] Error 1 Signed-off-by: Graham Gower <graham.gower@gmail.com> Acked-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/e2fsprogs')
-rw-r--r--recipes/e2fsprogs/e2fsprogs-1.41.9/llseek-uclibc.patch24
-rw-r--r--recipes/e2fsprogs/e2fsprogs_1.41.9.bb4
2 files changed, 27 insertions, 1 deletions
diff --git a/recipes/e2fsprogs/e2fsprogs-1.41.9/llseek-uclibc.patch b/recipes/e2fsprogs/e2fsprogs-1.41.9/llseek-uclibc.patch
new file mode 100644
index 0000000000..026db2a47d
--- /dev/null
+++ b/recipes/e2fsprogs/e2fsprogs-1.41.9/llseek-uclibc.patch
@@ -0,0 +1,24 @@
+diff -ur e2fsprogs-1.41.9.orig/lib/blkid/llseek.c e2fsprogs-1.41.9/lib/blkid/llseek.c
+--- e2fsprogs-1.41.9.orig/lib/blkid/llseek.c 2009-08-13 11:09:57.000000000 +0930
++++ e2fsprogs-1.41.9/lib/blkid/llseek.c 2010-12-01 13:23:48.000000000 +1030
+@@ -28,7 +28,7 @@
+
+ #include "blkidP.h"
+
+-#ifdef __linux__
++#if defined(__linux__) && !(defined(__UCLIBC__) && !defined(__USE_FILE_OFFSET64))
+
+ #if defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE)
+
+diff -ur e2fsprogs-1.41.9.orig/lib/ext2fs/llseek.c e2fsprogs-1.41.9/lib/ext2fs/llseek.c
+--- e2fsprogs-1.41.9.orig/lib/ext2fs/llseek.c 2009-08-13 11:09:57.000000000 +0930
++++ e2fsprogs-1.41.9/lib/ext2fs/llseek.c 2010-12-01 13:18:26.000000000 +1030
+@@ -28,7 +28,7 @@
+ #include "et/com_err.h"
+ #include "ext2fs/ext2_io.h"
+
+-#ifdef __linux__
++#if defined(__linux__) && !(defined(__UCLIBC__) && !defined(__USE_FILE_OFFSET64))
+
+ #if defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE)
+
diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.9.bb b/recipes/e2fsprogs/e2fsprogs_1.41.9.bb
index 6a8c113116..026e35af2e 100644
--- a/recipes/e2fsprogs/e2fsprogs_1.41.9.bb
+++ b/recipes/e2fsprogs/e2fsprogs_1.41.9.bb
@@ -1,6 +1,8 @@
require e2fsprogs.inc
-PR = "${INC_PR}"
+PR = "${INC_PR}.1"
+
+SRC_URI += "file://llseek-uclibc.patch"
do_configure() {
oe_runconf