From patchwork Sat Apr 25 10:41:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 464485 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 18C3D14012F for ; Sat, 25 Apr 2015 20:39:32 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 603EB9177A; Sat, 25 Apr 2015 10:39:31 +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 E2AvpD4A3MQb; Sat, 25 Apr 2015 10:39:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8117A918E3; Sat, 25 Apr 2015 10:39:25 +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 DD4E81C0E31 for ; Sat, 25 Apr 2015 10:39:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D9C1E917D6 for ; Sat, 25 Apr 2015 10:39:19 +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 ixwryxFgirsy for ; Sat, 25 Apr 2015 10:39:17 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp4-g21.free.fr (smtp4-g21.free.fr [212.27.42.4]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4244B917CB for ; Sat, 25 Apr 2015 10:39:17 +0000 (UTC) Received: from x230.trabucayre.com (unknown [82.226.196.129]) by smtp4-g21.free.fr (Postfix) with ESMTP id 13CAA4C80D9; Sat, 25 Apr 2015 12:36:41 +0200 (CEST) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Sat, 25 Apr 2015 12:41:16 +0200 Message-Id: <1429958478-29114-1-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 2.0.5 Cc: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" Subject: [Buildroot] [PATCH v2 1/3] python-pyqt: fix PyQt_qreal_double enabling/disabling 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou fix : http://autobuild.buildroot.net/results/6a2/6a28855c11b321ce8ceaf0acdd5395738af931fd/ http://autobuild.buildroot.net/results/91a/91a3641d1e4126475bbca0d3c779582832f6db91/ http://autobuild.buildroot.net/results/b10/b10fa70c199fc2de405068fea1eac80c29577747/ http://autobuild.buildroot.net/results/b53/b5334ac80afb58a19bd40b7c0b18378d75bc8fc7/ http://autobuild.buildroot.net/results/01f/01fa1319e467c3c2410fd462dc40c18b82dc8246/ http://autobuild.buildroot.net/results/2e6/2e6cae93ab860175c405e440bc7e24334b5b14e8/ According to configure-ng.py, PyQt_qreal_double must be disabled on ARM target and when QT_NO_FPU is set. Signed-off-by: Gwenhael Goavec-Merou --- Changes v1 -> v2: * disable PyQt_qreal_double for sh4, sh4a, sh4aeb and QWS & mips --- package/python-pyqt/python-pyqt.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/package/python-pyqt/python-pyqt.mk b/package/python-pyqt/python-pyqt.mk index 2363f7d..c151dfd 100644 --- a/package/python-pyqt/python-pyqt.mk +++ b/package/python-pyqt/python-pyqt.mk @@ -33,13 +33,24 @@ endif # Turn off features that aren't available in QWS and current qt # configuration. PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES = \ - PyQt_Accessibility PyQt_SessionManager PyQt_qreal_double \ + PyQt_Accessibility PyQt_SessionManager \ PyQt_Shortcut PyQt_RawFont ifeq ($(BR2_PACKAGE_QT_OPENSSL),) PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES += PyQt_OpenSSL endif +# PyQt_qreal_double must be disabled on ARM or when QT_NO_FPU is set +# QT_NO_FPU is set for ARM, SH4 and SH4A +ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_sh4)$(BR2_sh4a)$(BR2_sh4aeb),y) +PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES += PyQt_qreal_double +endif + +# QT_NO_FPU is also set for QWS on misp +ifeq ($(BR2_PACKAGE_QT_EMBEDDED)x$(BR2_mipsel)$(BR2_mips),yxy) +PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES += PyQt_qreal_double +endif + define PYTHON_PYQT_QTDETAIL echo $(1) >> $(2)/qtdetail.out endef