From patchwork Thu Dec 5 17:14:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Drake X-Patchwork-Id: 1204725 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=codethink.co.uk Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47TNFq4dDBz9sP3 for ; Fri, 6 Dec 2019 04:37:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CACAB883BE; Thu, 5 Dec 2019 17:37:17 +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 q+x5J9TZx2MR; Thu, 5 Dec 2019 17:37:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A713D883A7; Thu, 5 Dec 2019 17:37:16 +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 007E01BF5AA for ; Thu, 5 Dec 2019 17:37:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EF16288399 for ; Thu, 5 Dec 2019 17:37:13 +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 f2puiVQUxCbW for ; Thu, 5 Dec 2019 17:37:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from imap2.colo.codethink.co.uk (imap2.colo.codethink.co.uk [78.40.148.184]) by whitealder.osuosl.org (Postfix) with ESMTPS id 63A2E883B6 for ; Thu, 5 Dec 2019 17:37:11 +0000 (UTC) Received: from [167.98.27.226] (helo=ts007-build.ts007.codethink.co.uk) by imap2.colo.codethink.co.uk with esmtpsa (Exim 4.92 #3 (Debian)) id 1icuit-0007Yj-Bd; Thu, 05 Dec 2019 17:15:27 +0000 From: Michael Drake To: buildroot@busybox.net Date: Thu, 5 Dec 2019 17:14:50 +0000 Message-Id: <20191205171517.96639-4-michael.drake@codethink.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191205171517.96639-1-michael.drake@codethink.co.uk> References: <20191205171517.96639-1-michael.drake@codethink.co.uk> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v1 03/30] package/qt5/qt5webengine: Use Buildroot's host-pkg-config wrapper X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Drake , Thomas Preston Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Thomas Preston Buildroot now has a host package config wrapper to use pkgconf with the host enviornment, so qt5webengine should use that instead of its own one. Signed-off-by: Thomas Preston Signed-off-by: Michael Drake --- package/qt5/qt5webengine/host-pkg-config.in | 6 ------ package/qt5/qt5webengine/qt5webengine.mk | 7 +------ 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 package/qt5/qt5webengine/host-pkg-config.in diff --git a/package/qt5/qt5webengine/host-pkg-config.in b/package/qt5/qt5webengine/host-pkg-config.in deleted file mode 100644 index 86a980648b..0000000000 --- a/package/qt5/qt5webengine/host-pkg-config.in +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -PKG_CONFIG_SYSROOT_DIR="/" \ -PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ -PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ -PKG_CONFIG_LIBDIR="@HOST_DIR@/lib/pkgconfig:@HOST_DIR@/share/pkgconfig" \ -exec @HOST_DIR@/bin/pkgconf "$@" diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 1d5ee8d819..95666f5469 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -55,12 +55,7 @@ QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)" ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG - sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config - chmod +x $(@D)/host-bin/host-pkg-config -endef -QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG -QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config +QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(PKG_CONFIG_HOST_BINARY_HOST) endif define QT5WEBENGINE_CONFIGURE_CMDS