From patchwork Mon Sep 16 22:55:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hurrhnn--- via openwrt-devel X-Patchwork-Id: 1163120 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=lists.openwrt.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ImCqw8o7"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46XM6b72j7z9sNf for ; Tue, 17 Sep 2019 08:56:06 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type:Subject: List-Help:Reply-To:List-Archive:List-Unsubscribe:List-Subscribe:From: List-Post:List-Id:Message-ID:MIME-Version:Date:To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=TmA5Gm5DLUcf+DyWBH2tfIxgUCca+WNJeha7CCr0qZY=; b=ImC qw8o7pqhkYsukE7femnH571l3hMkvDyOAJdWtgkoNAcXe4BtN7qypglcvlWXS4iDXvor3LeLNsu+Q HZg386bReWJfAheKAhUMlrBiFtCjAGGwqMTABAnrnUJuCzObNV2rPsjAaQHfv38QRqrEokVhUGwmQ AIJ5N2c8y+vE/+xCkOPlXzPCrfYsH4likF3VsoljvgFVGtHco3QGY7jr1URgoJ9IhVHi19jkGa9H5 qC0QyBkR2Sz4cNscjsNoCZKiwVjAgDLMJVpigQFUWY+SceFIHO4kof5KsJnX/DPEgsS3KZ/mjXdp/ /VLr1UDC8qLdkaqVe2tCY9Vyp4fJ1GQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1i9zuS-0005V0-TS; Mon, 16 Sep 2019 22:55:52 +0000 To: openwrt-devel@lists.openwrt.org Date: Mon, 16 Sep 2019 17:55:42 -0500 MIME-Version: 1.0 Message-ID: List-Id: List-Post: X-Patchwork-Original-From: Thomas Albers via openwrt-devel From: hurrhnn--- via openwrt-devel Precedence: list X-Mailman-Version: 2.1.29 X-BeenThere: openwrt-devel@lists.openwrt.org List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Thomas Albers List-Help: Subject: [OpenWrt-Devel] [PATCH] build: fix make kernel_menuconfig Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software. Use system pkg-config instead of toolchain pkg-config when the kernel config scripts are compiled (see FS#2423) Signed-off-by: Thomas Albers --- Makefile | 1 + tools/pkg-config/files/pkg-config | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5301883061..7bfc34e002 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,7 @@ $(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the OpenWrt dir world: +export SYSTEM_PKG_CONFIG:=$(shell which pkg-config) export PATH:=$(TOPDIR)/staging_dir/host/bin:$(PATH) ifneq ($(OPENWRT_BUILD),1) diff --git a/tools/pkg-config/files/pkg-config b/tools/pkg-config/files/pkg-config index 82cc74ffcb..00243e663e 100755 --- a/tools/pkg-config/files/pkg-config +++ b/tools/pkg-config/files/pkg-config @@ -1,3 +1,7 @@ #!/bin/sh -pkg-config.real --define-variable=prefix=${STAGING_PREFIX} --define-variable=exec_prefix=${STAGING_PREFIX} --define-variable=bindir=${STAGING_PREFIX}/bin $@ +if [ -n "${STAGING_PREFIX}" ]; then + pkg-config.real --define-variable=prefix=${STAGING_PREFIX} --define-variable=exec_prefix=${STAGING_PREFIX} --define-variable=bindir=${STAGING_PREFIX}/bin $@ +else + ${SYSTEM_PKG_CONFIG} $@ +fi