From patchwork Fri Feb 6 16:12:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vicente Olivert Riera X-Patchwork-Id: 437352 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id C8072140216 for ; Sat, 7 Feb 2015 03:12:33 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4197894C25; Fri, 6 Feb 2015 16:12:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xJ+wDgNV3A5w; Fri, 6 Feb 2015 16:12:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 720DA94C22; Fri, 6 Feb 2015 16:12:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 7ADDC1C2971 for ; Fri, 6 Feb 2015 16:12:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6D49C31BA5 for ; Fri, 6 Feb 2015 16:12:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G43Zc7NWpJbx for ; Fri, 6 Feb 2015 16:12:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196]) by silver.osuosl.org (Postfix) with ESMTP id 95FBD30C6B for ; Fri, 6 Feb 2015 16:12:29 +0000 (UTC) Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id 934F321F4834B for ; Fri, 6 Feb 2015 16:12:24 +0000 (GMT) Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.195.1; Fri, 6 Feb 2015 16:12:27 +0000 Received: from localhost.localdomain (192.168.154.104) by LEMAIL01.le.imgtec.org (192.168.152.62) with Microsoft SMTP Server (TLS) id 14.3.210.2; Fri, 6 Feb 2015 16:12:25 +0000 From: Vicente Olivert Riera To: Date: Fri, 6 Feb 2015 16:12:19 +0000 Message-ID: <1423239139-56155-1-git-send-email-Vincent.Riera@imgtec.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 X-Originating-IP: [192.168.154.104] Subject: [Buildroot] [PATCH] qt5/qt5base: Fix build on MIPS without DSP support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The qt_memfill32_asm_mips_dsp function is only declared if QT_COMPILER_SUPPORTS_MIPS_DSP is defined, so we can't reference it unless the same macro is defined. Backporting an upstream patch to fix this issue. This is the error message: qt-everywhere-enterprise-src-5.4.0-alpha/qtbase/src/gui/painting/qdrawhelper.cpp: In function 'void qInitDrawhelperAsm()': qt-everywhere-enterprise-src-5.4.0-alpha/qtbase/src/gui/painting/qdrawhelper.cpp:6843: error: 'qt_memfill32_asm_mips_dsp' was not declared in this scope Upstream commit: https://qt.gitorious.org/qt/qtbase/commit/2ca323ccd4f25f409eff8fc0c9804099b78c2bde Fixes: http://autobuild.buildroot.net/results/254/254cf62bef8bc5d5ffe345d817d16aa9983baa15/ Signed-off-by: Vicente Olivert Riera --- ...cpp-Fix-build-on-mips-without-dsp-support.patch | 47 ++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) create mode 100644 package/qt5/qt5base/0005-qdrawhelper.cpp-Fix-build-on-mips-without-dsp-support.patch diff --git a/package/qt5/qt5base/0005-qdrawhelper.cpp-Fix-build-on-mips-without-dsp-support.patch b/package/qt5/qt5base/0005-qdrawhelper.cpp-Fix-build-on-mips-without-dsp-support.patch new file mode 100644 index 0000000..ede4d80 --- /dev/null +++ b/package/qt5/qt5base/0005-qdrawhelper.cpp-Fix-build-on-mips-without-dsp-support.patch @@ -0,0 +1,47 @@ +qdrawhelper.cpp: Fix build on MIPS without DSP support + +The qt_memfill32_asm_mips_dsp function is only declared if +QT_COMPILER_SUPPORTS_MIPS_DSP is defined, so we can't reference it +unless the same macro is defined. + +Backporting an upstream patch to fix this issue. + +Upstream commit: + + https://qt.gitorious.org/qt/qtbase/commit/2ca323ccd4f25f409eff8fc0c9804099b78c2bde + +Signed-off-by: Vicente Olivert Riera + +From 2ca323ccd4f25f409eff8fc0c9804099b78c2bde Mon Sep 17 00:00:00 2001 +From: Eskil Abrahamsen Blomfeldt +Date: Tue, 11 Nov 2014 13:11:54 +0100 +Subject: [PATCH] Android: Compile for MIPS + +The qt_memfill32_asm_mips_dsp function is only declared if +QT_COMPILER_SUPPORTS_MIPS_DSP is defined, so we can't reference it +unless the same macro is defined. + +Change-Id: Ib959b4b969b699ca78804394206266469b4ebf64 +Task-number: QTBUG-36017 +Reviewed-by: Paul Olav Tvete +Reviewed-by: Thiago Macieira +--- + src/gui/painting/qdrawhelper.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp +index f2d27a0..6482cc5 100644 +--- a/src/gui/painting/qdrawhelper.cpp ++++ b/src/gui/painting/qdrawhelper.cpp +@@ -6829,7 +6829,7 @@ void qInitDrawhelperAsm() + qt_fetch_radial_gradient = qt_fetch_radial_gradient_neon; + #endif + +-#ifdef Q_PROCESSOR_MIPS_32 ++#if defined(Q_PROCESSOR_MIPS_32) && defined(QT_COMPILER_SUPPORTS_MIPS_DSP) + qt_memfill32 = qt_memfill32_asm_mips_dsp; + #endif // Q_PROCESSOR_MIPS_32 + +-- +1.7.1 +