From patchwork Tue Oct 18 12:30:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Derycke X-Patchwork-Id: 683684 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3syvYq1ww2z9s3s for ; Tue, 18 Oct 2016 23:30:55 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=CZGKWxF5; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 075378F9D2; Tue, 18 Oct 2016 12:30:52 +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 Tbck6IcrHWsj; Tue, 18 Oct 2016 12:30:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 35B468E252; Tue, 18 Oct 2016 12:30:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2264D1CF3FB for ; Tue, 18 Oct 2016 12:30:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 213FD8DD56 for ; Tue, 18 Oct 2016 12:30:47 +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 7hM+remGgiXk for ; Tue, 18 Oct 2016 12:30:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f52.google.com (mail-lf0-f52.google.com [209.85.215.52]) by whitealder.osuosl.org (Postfix) with ESMTPS id 121328B753 for ; Tue, 18 Oct 2016 12:30:45 +0000 (UTC) Received: by mail-lf0-f52.google.com with SMTP id b81so341288796lfe.1 for ; Tue, 18 Oct 2016 05:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=sj64qkJmjQOPNs9mnryiEHpSk4MaOLr6gG9JISjRxa4=; b=CZGKWxF5+pZQrrVe5WRARUWZptUaHIh0q0abtNs6bxqi5dyveOUd7YtFctLUJtRmTQ E4rOto9UrA0GGem3TfTQBvLkWw7f3k7/FKTqGDUsQwx/tmK2STE9F5QRRUK+G8r13wbb wDHCs2NclvZKs8mDgEymI8RdPp7Ne1rX0ckjrztI53Y9mFuqxNM/1Q7FnoD139X2DSX8 m/ympRudQPR7VluWscmHsimjxWZINBPScb7cSZ53kDu1g8+R2LDSkAwXX3zNMzsJcI4E upypLl8NM4Y7h2lFMEPfLwJNyYsabDIU0767in4BdOs2UHV4/oHgvRVqqFlCbmot9ImR BPsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=sj64qkJmjQOPNs9mnryiEHpSk4MaOLr6gG9JISjRxa4=; b=Ffrm22W5kSYwgfmu0RSNG5a0F24z/qamEpUlKaktxlVGHdDNICk0qLQVtrcxVpMJ7L zS54BstuQ8WfCjUnZW0e9w+W8xUxOxgfr9zbpcSWNJTwfszVI5jvEnK3NtEdOW/R9pcB p9pfoZJZXs3L4bPkJPdQVwcg9b/xwh7b3vhV1OrVGvHCgIWRgPRn0en9PE6Q/mafHeos qM/y4JKxHDrjSqLuLRtf5Ps3u3ZqrOtPw6+dWLCwpM6emIv+NXElaWqk91AFmdVmHVHV lGTDCpM8n0kuQW/Ly6y8at49WY43jBetoXeBBDSWodJzBdVEepWc4/vo9uurJYb9HmwU nhXQ== X-Gm-Message-State: AA6/9RlAAXxWWjoU9nyDrqBxeYB02CqRIe+WqqS4Wi7AhsCPmS+bE/6nfSyTudqwRh4M55Gc0LLHyPMBMinYJw== X-Received: by 10.25.18.39 with SMTP id h39mr247614lfi.138.1476793842408; Tue, 18 Oct 2016 05:30:42 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Johan Derycke Date: Tue, 18 Oct 2016 12:30:31 +0000 Message-ID: To: buildroot , arnout@mind.be Subject: [Buildroot] [buildroot][PATCH 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes issue with https://git.buildroot.net/buildroot/commit/?id=ac16793eaaabfced0312420759e3a66cdaa1ea8e We make a link in $(@D)/bin/python: define QT5WEBKIT_PYTHON2_SYMLINK echo $(@D) mkdir -p $(@D)/bin ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/bin/python endef But QT5WEBKIT_INSTALL_TARGET_CMDS copies $(@D)/bin/python to the target dir: define QT5WEBKIT_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebKit*.so.* $(TARGET_DIR)/usr/lib cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/ $(QT5WEBKIT_INSTALL_TARGET_QMLS) endef This overwrites the target python link with a bogus one. The bin folder only contains 'jsc' which is now optional. Signed-off-by: Johan Derycke --- package/qt5/qt5webkit/Config.in | 13 +++++++++++++ package/qt5/qt5webkit/qt5webkit.mk | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) -- 2.4.4 diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 48aaf94..240a75e 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -22,6 +22,19 @@ config BR2_PACKAGE_QT5WEBKIT http://qt.io +if BR2_PACKAGE_QT5WEBKIT + +config BR2_PACKAGE_QT5WEBKIT_JSC + bool "qt5webkit jsc" + depends on BR2_PACKAGE_QT5WEBKIT + help + Install jsc. jsc is a command-line utility that allows you to run + JavaScript programs outside of the context of a web browser. + + https://trac.webkit.org/wiki/JSC + +endif + comment "qt5webkit needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/ qt5webkit.mk index a47a235..600a660 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -69,9 +69,15 @@ define QT5WEBKIT_INSTALL_TARGET_QMLS endef endif +ifeq ($(BR2_PACKAGE_QT5WEBKIT_JSC),y) +define QT5WEBKIT_INSTALL_TARGET_JSC + cp -dpf $(@D)/bin/jsc $(TARGET_DIR)/usr/bin/ +endef +endif + define QT5WEBKIT_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebKit*.so.* $(TARGET_DIR)/usr/lib - cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/ + $(QT5WEBKIT_INSTALL_TARGET_JSC) $(QT5WEBKIT_INSTALL_TARGET_QMLS) endef