From patchwork Sun Jun 28 19:42:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 489158 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 00314140779 for ; Mon, 29 Jun 2015 05:43:20 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=wVCLhmdY; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1A8DAA1602; Sun, 28 Jun 2015 19:43:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mFF4h7epfw4h; Sun, 28 Jun 2015 19:43:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9807DA161D; Sun, 28 Jun 2015 19:43:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 403141C1EFA for ; Sun, 28 Jun 2015 19:43:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3D3D899FFE for ; Sun, 28 Jun 2015 19:43:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qKA3YGYVnNNp for ; Sun, 28 Jun 2015 19:43:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by fraxinus.osuosl.org (Postfix) with ESMTPS id E3ADF99CB9 for ; Sun, 28 Jun 2015 19:42:59 +0000 (UTC) Received: by wicnd19 with SMTP id nd19so82362488wic.1 for ; Sun, 28 Jun 2015 12:42:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fFsgQOU+YYSW1IKLw83sbIpQgDoLGbt/drfxco+1sRo=; b=wVCLhmdY7KxK61qvxbzn1KPwN2lFfb3uRMbYoh+qfYU6HRwFxjcmSYycuL9WzLqEu0 ZbMywoeINJoEHZN9ltMR9gmj/AHXhzA0EepFsDUYH5AMFReptgJ3VIPtmwhncUMdN20B imYXJs//04XD6cprx6g9ctnjBFoy6xK+qz1OIGmKZM/LhxVUa7QIC6yQTKJi88ZmioGW d5tMb6Mvsa9uP8xy509YsA4SK5Tm5hzSYeA7eUqb/nWHjl6c/O3b3oB8FF1UQTovZI0m NsIQZSfoLjfP0Mol0VRuR+iGd5y8hx/2xuWmCJvh/gorQbzxr6saNSoZlrig6T9489+M DgTw== X-Received: by 10.194.6.229 with SMTP id e5mr23198361wja.158.1435520578685; Sun, 28 Jun 2015 12:42:58 -0700 (PDT) Received: from beast.localdomain (dynamic-adsl-78-15-144-100.clienti.tiscali.it. [78.15.144.100]) by mx.google.com with ESMTPSA id ex8sm3789243wjc.34.2015.06.28.12.42.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Jun 2015 12:42:58 -0700 (PDT) From: Fabio Porcedda To: buildroot@uclibc.org Date: Sun, 28 Jun 2015 21:42:38 +0200 Message-Id: <1435520570-20332-5-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1435520570-20332-1-git-send-email-fabio.porcedda@gmail.com> References: <1435520570-20332-1-git-send-email-fabio.porcedda@gmail.com> Subject: [Buildroot] [RFC v4 04/16] packages/qt: read spec files from the per-package staging directory 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" In order to support the per-package staging feature, read spec files from the subdirectory "mkspecs" that is in the per-package staging directory. Signed-off-by: Fabio Porcedda --- package/python-pyqt/python-pyqt.mk | 1 + package/python-sip/python-sip.mk | 2 +- package/qt/qt.mk | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/python-pyqt/python-pyqt.mk b/package/python-pyqt/python-pyqt.mk index fa298c4..0ee9352 100644 --- a/package/python-pyqt/python-pyqt.mk +++ b/package/python-pyqt/python-pyqt.mk @@ -73,6 +73,7 @@ PYTHON_PYQT_CONF_OPTS = \ --bindir $(TARGET_DIR)/usr/bin \ --destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/site-packages \ --qmake $(HOST_DIR)/usr/bin/qmake \ + --spec $(STAGING_DIR)/usr/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++ \ --sysroot $(STAGING_DIR)/usr \ -w --confirm-license \ --no-designer-plugin \ diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk index 4651186..4ac6413 100644 --- a/package/python-sip/python-sip.mk +++ b/package/python-sip/python-sip.mk @@ -46,7 +46,7 @@ define PYTHON_SIP_CONFIGURE_CMDS --sipdir $(TARGET_DIR)/usr/share/sip \ --sysroot $(STAGING_DIR)/usr \ --use-qmake && \ - $(HOST_DIR)/usr/bin/qmake) + $(QT_QMAKE)) endef define PYTHON_SIP_BUILD_CMDS diff --git a/package/qt/qt.mk b/package/qt/qt.mk index a4a55ec..0644fbe 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -457,7 +457,7 @@ endif # End of workaround. # Variable for other Qt applications to use -QT_QMAKE = $(HOST_DIR)/usr/bin/qmake -spec qws/linux-$(QT_EMB_PLATFORM)-g++ +QT_QMAKE = $(HOST_DIR)/usr/bin/qmake -spec $(STAGING_DIR)/usr/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++ ################################################################################ # QT_QMAKE_SET -- helper macro to set = in