From patchwork Sat Apr 14 19:26:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 152547 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 588B4B7000 for ; Sun, 15 Apr 2012 05:31:07 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D642A8FAB3; Sat, 14 Apr 2012 19:30:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Q3sp+DC5+mPL; Sat, 14 Apr 2012 19:30:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 552D28FAC9; Sat, 14 Apr 2012 19:30:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 977478F78E for ; Sat, 14 Apr 2012 19:29:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7A1D28FA11 for ; Sat, 14 Apr 2012 19:29:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zw1wwFXm-V6x for ; Sat, 14 Apr 2012 19:29:48 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.224]) by whitealder.osuosl.org (Postfix) with ESMTP id 049E38F8F0 for ; Sat, 14 Apr 2012 19:29:48 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id E829396ABF; Sat, 14 Apr 2012 19:29:47 +0000 (UTC) From: Peter Korsgaard To: buildroot@busybox.net Date: Sat, 14 Apr 2012 21:26:52 +0200 X-Git-Refname: refs/heads/master X-Git-Oldrev: 9d4d2086351c1e85ad3571380511640426a40206 X-Git-Newrev: 650195deb9168dd2e250b8145448ed580ea4601b X-Patchwork-Hint: ignore Message-Id: <20120414192947.E829396ABF@busybox.osuosl.org> Subject: [Buildroot] [git commit] qt: fix build on uClibc without lfs support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net commit: http://git.buildroot.net/buildroot/commit/?id=650195deb9168dd2e250b8145448ed580ea4601b branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- package/qt/qt-uClibc-lfs-fix.patch | 41 ++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/package/qt/qt-uClibc-lfs-fix.patch b/package/qt/qt-uClibc-lfs-fix.patch new file mode 100644 index 0000000..ea04a60 --- /dev/null +++ b/package/qt/qt-uClibc-lfs-fix.patch @@ -0,0 +1,41 @@ +From 6f88b27de256266947a7f6a3e70e18510754aab2 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Sat, 14 Apr 2012 20:36:07 +0200 +Subject: [PATCH] mkspecs/common/posix: fix !largefile builds on uClibc + +uClibc doesn't even define O_LARGEFILE when not configured with large file +support, so ensure this define is only used when Qt is built with +-largefile, otherwise the build fails with: + +io/qtemporaryfile.cpp: In function 'bool createFileFromTemplate( + NativeFileHandle&, QFileSystemEntry::NativePath&, size_t, size_t, + QSystemError&)': +io/qtemporaryfile.cpp:197:57: error: 'O_LARGEFILE' was not declared in + this scope + +Reported-Upstream: https://bugreports.qt-project.org/browse/QTBUG-25321 +Signed-off-by: Peter Korsgaard +--- + mkspecs/common/posix/qplatformdefs.h | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/mkspecs/common/posix/qplatformdefs.h b/mkspecs/common/posix/qplatformdefs.h +index daecc00..8a796cf 100644 +--- a/mkspecs/common/posix/qplatformdefs.h ++++ b/mkspecs/common/posix/qplatformdefs.h +@@ -123,7 +123,12 @@ + #define QT_READ ::read + #define QT_WRITE ::write + ++#ifdef QT_LARGEFILE_SUPPORT + #define QT_OPEN_LARGEFILE O_LARGEFILE ++#else ++#define QT_OPEN_LARGEFILE 0 ++#endif ++ + #define QT_OPEN_RDONLY O_RDONLY + #define QT_OPEN_WRONLY O_WRONLY + #define QT_OPEN_RDWR O_RDWR +-- +1.7.8.3 +