From patchwork Wed Mar 19 19:30:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 331841 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 B16B72C00A8 for ; Thu, 20 Mar 2014 06:31:15 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0C0238B560; Wed, 19 Mar 2014 19:31:15 +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 t7NymyxSZT0E; Wed, 19 Mar 2014 19:31:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 6A6888B4F9; Wed, 19 Mar 2014 19:31:10 +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 E467B1BF856 for ; Wed, 19 Mar 2014 19:31:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DC1EE8B4F9 for ; Wed, 19 Mar 2014 19:31:06 +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 68mg8tx1zUWM for ; Wed, 19 Mar 2014 19:31:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by whitealder.osuosl.org (Postfix) with ESMTPS id D45738B454 for ; Wed, 19 Mar 2014 19:31:05 +0000 (UTC) Received: by mail-ee0-f49.google.com with SMTP id c41so6907545eek.22 for ; Wed, 19 Mar 2014 12:31:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:content-transfer-encoding:subject :message-id:in-reply-to:references:user-agent:date:from:to; bh=Ua50RWrhdPJdopcZ6mlXr9j5QXznMPMvFHbAGGP1v1g=; b=kct7lcRN1KHEUuZ0F/blupjdx8kDvrDYYUb6LZ6qSzoaw6bO9iX+8+4opSHbHKvm2d pe8tDxfPmlZ3CZOR1WwMlpxcdN9gLATvSecno5lSNAmLDZ0F7+1bk2OJGa4X7YFyg8TF u52oiwkpbZdPvcCSdrzg9DYx1dKB+eQEm4AolSE4GF+EFxPjznEVTlKokWaN91n+ODsQ A4d20Gxwh26C+zeIZ1TkbxCh9Pbe+zrRDuvmdsbZKdX3ykZNgFzDnkDiLGJRfQveajJD KmKC/x+9hEw54wehBB7V0EBkUiigkZa78EswnnztoavqamL6aQf/WistoCDKLMqcrwBG /LKQ== X-Received: by 10.15.53.135 with SMTP id r7mr554501eew.102.1395257464379; Wed, 19 Mar 2014 12:31:04 -0700 (PDT) Received: from [127.0.1.1] (d54c62eeb.access.telenet.be. [84.198.46.235]) by mx.google.com with ESMTPSA id o5sm56696758eeg.8.2014.03.19.12.31.02 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Mar 2014 12:31:03 -0700 (PDT) MIME-Version: 1.0 X-Mercurial-Node: bb907111e06d6d25c78f0e0f495eb0af23e78e1e Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.2.2 Date: Wed, 19 Mar 2014 20:30:06 +0100 From: Thomas De Schampheleire To: buildroot@buildroot.org Subject: [Buildroot] [PATCH 1 of 4] qt5 packages: set correct PATH when running qmake 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net The qmake step of qt5 packages may attempt to run pkg-config. If qmake is executed in an environment where the buildroot host directory is not in PATH, pkg-config from the build machine may be used (/usr/bin/pkg-config). This causes qt5 package compilation to fail on machines that do not have pkg-config installed. Refer to mailing list thread [1] for a specific error case. This patch prepends TARGET_MAKE_ENV (which sets PATH) to the qmake call. Reported-by: Marco Trapanese Signed-off-by: Thomas De Schampheleire [1] http://lists.busybox.net/pipermail/buildroot/2014-March/092283.html Reviewed-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5connectivity/qt5connectivity.mk | 2 +- package/qt5/qt5declarative/qt5declarative.mk | 2 +- package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 2 +- package/qt5/qt5imageformats/qt5imageformats.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.mk | 2 +- package/qt5/qt5quick1/qt5quick1.mk | 2 +- package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +- package/qt5/qt5script/qt5script.mk | 2 +- package/qt5/qt5sensors/qt5sensors.mk | 2 +- package/qt5/qt5serialport/qt5serialport.mk | 2 +- package/qt5/qt5svg/qt5svg.mk | 2 +- package/qt5/qt5x11extras/qt5x11extras.mk | 2 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -23,7 +23,7 @@ QT5CONNECTIVITY_DEPENDENCIES += qt5decla endif define QT5CONNECTIVITY_CONFIGURE_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/qmake) + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef define QT5CONNECTIVITY_BUILD_CMDS diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -19,7 +19,7 @@ QT5DECLARATIVE_REDISTRIBUTE = NO endif define QT5DECLARATIVE_CONFIGURE_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/qmake) + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef define QT5DECLARATIVE_BUILD_CMDS diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -21,7 +21,7 @@ QT5GRAPHICALEFFECTS_REDISTRIBUTE = NO endif define QT5GRAPHICALEFFECTS_CONFIGURE_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/qmake) + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef define QT5GRAPHICALEFFECTS_BUILD_CMDS diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -19,7 +19,7 @@ QT5IMAGEFORMATS_REDISTRIBUTE = NO endif define QT5IMAGEFORMATS_CONFIGURE_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/qmake) + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef define QT5IMAGEFORMATS_BUILD_CMDS diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -25,7 +25,7 @@ QT5MULTIMEDIA_DEPENDENCIES += gst-plugin endif define QT5MULTIMEDIA_CONFIGURE_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/qmake) + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef define QT5MULTIMEDIA_BUILD_CMDS diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk --- a/package/qt5/qt5quick1/qt5quick1.mk +++ b/package/qt5/qt5quick1/qt5quick1.mk @@ -20,7 +20,7 @@ QT5QUICK1_REDISTRIBUTE = NO endif define QT5QUICK1_CONFIGURE_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/qmake) + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef define QT5QUICK1_BUILD_CMDS diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -19,7 +19,7 @@ QT5QUICKCONTROLS_REDISTRIBUTE = NO endif define QT5QUICKCONTROLS_CONFIGURE_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/qmake) + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef define QT5QUICKCONTROLS_BUILD_CMDS diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -19,7 +19,7 @@ QT5SCRIPT_REDISTRIBUTE = NO endif define QT5SCRIPT_CONFIGURE_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/qmake) + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef define QT5SCRIPT_BUILD_CMDS diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -23,7 +23,7 @@ QT5SENSORS_DEPENDENCIES += qt5declarativ endif define QT5SENSORS_CONFIGURE_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/qmake) + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef define QT5SENSORS_BUILD_CMDS diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -19,7 +19,7 @@ QT5SERIALPORT_REDISTRIBUTE = NO endif define QT5SERIALPORT_CONFIGURE_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/qmake) + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef define QT5SERIALPORT_BUILD_CMDS diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -20,7 +20,7 @@ QT5SVG_REDISTRIBUTE = NO endif define QT5SVG_CONFIGURE_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/qmake) + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef define QT5SVG_BUILD_CMDS diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -19,7 +19,7 @@ QT5X11EXTRAS_REDISTRIBUTE = NO endif define QT5X11EXTRAS_CONFIGURE_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/qmake) + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef define QT5X11EXTRAS_BUILD_CMDS diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -19,7 +19,7 @@ QT5XMLPATTERNS_REDISTRIBUTE = NO endif define QT5XMLPATTERNS_CONFIGURE_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/qmake) + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef define QT5XMLPATTERNS_BUILD_CMDS