From patchwork Wed Oct 19 14:35:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Derycke X-Patchwork-Id: 684145 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]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3szZHQ3pR8z9vFY for ; Thu, 20 Oct 2016 01:35:46 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smtpcorp.com header.i=@smtpcorp.com header.b=gRpsqEDO; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0600789D3E; Wed, 19 Oct 2016 14:35:45 +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 CvAj_cyg3t4H; Wed, 19 Oct 2016 14:35:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 59CD989FD7; Wed, 19 Oct 2016 14:35:44 +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 EFE331C15DD for ; Wed, 19 Oct 2016 14:35:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id ECCD189FF2 for ; Wed, 19 Oct 2016 14:35:42 +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 iagKHPVEylFC for ; Wed, 19 Oct 2016 14:35:42 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from a1i930.smtp2go.com (a1i930.smtp2go.com [43.228.187.162]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 371E789FD7 for ; Wed, 19 Oct 2016 14:35:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpcorp.com; s=a0-2; h=Feedback-ID:X-Smtpcorp-Track:Message-Id:Date: Subject:To:From:List-Unsubscribe:Reply-To; bh=VhRdW+JyrVXXfIayY+rIyFyixdz0Roz+x3SiVgPmdkw=; b=gRpsqEDOKMi3wkDS37hSSARZqX VdrvbTowwQieyVQIGSfBVhGXj3mUHQuOSL4sxCPRvOeTzaNzuV5JOPKVvI9vTTfZx8JSrdnNWpkW5 SFLUDKTV6QElyIv4yDt5h8T1pgf0CR9E3WGNMxxw/Amfaf0kFaGVBokc5IzSVpGqVnxj+RPlvIcpm nKZ3XTBtm0oFtG2b94rywCAtQx9N+3YhUXhcQcQeSWWiONE1DgRwRzqWP9oW+is9t0aHu2McbG6Gw /XCQ9R9JCI7oK+VPmYloP7tFPB0doPsgxgLDv6eJwsvuygCBzgqTI3BAVUCi5/bgzqZx/bEoyRYrF 2E+mB3TQ==; From: johanderycke@gmail.com To: buildroot@buildroot.org Date: Wed, 19 Oct 2016 16:35:24 +0200 Message-Id: <1476887724-30979-1-git-send-email-johanderycke@gmail.com> X-Mailer: git-send-email 2.1.4 X-Smtpcorp-Track: 1Pwrxy9EFQo5FG.U8S7gCR3d Feedback-ID: 228342m:228342a8H1wBx:228342sxA8eKXxW9:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Cc: Johan Derycke Subject: [Buildroot] [PATCH V3, 1/1] Fix: qt5webkit overwrites target python. 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: Johan Derycke Fixes issue with https://git.buildroot.net/buildroot/commit/?id=ac16793eaaabfced0312420759e3a66cdaa1ea8e. We made a link in $(@D)/bin/python which is copied to $(TARGET_DIR) during install and overwrites target pyton. Fixed by using $(@D)/host-bin instead. Signed-off-by: Johan Derycke Tested-by: Yegor Yefremov --- Changes v2 -> v3 - Added Tested-by - More detailed commit log Changes v1 -> v2: - simpler fix suggested by Thomas package/qt5/qt5webkit/qt5webkit.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index f300c11..378cdf7 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -36,10 +36,10 @@ endif # QtWebkit's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBKIT_ENV = PATH=$(@D)/bin:$(BR_PATH) +QT5WEBKIT_ENV = PATH=$(@D)/host-bin:$(BR_PATH) define QT5WEBKIT_PYTHON2_SYMLINK - mkdir -p $(@D)/bin - ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/bin/python + mkdir -p $(@D)/host-bin + ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/host-bin/python endef QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK