From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5D48C433EF for ; Wed, 2 Mar 2022 21:48:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238669AbiCBVtA (ORCPT ); Wed, 2 Mar 2022 16:49:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234670AbiCBVs7 (ORCPT ); Wed, 2 Mar 2022 16:48:59 -0500 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 952EC3193E for ; Wed, 2 Mar 2022 13:48:15 -0800 (PST) Received: by mail-lf1-x129.google.com with SMTP id y24so5138540lfg.1 for ; Wed, 02 Mar 2022 13:48:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=OmEHlpCk9+kT+4UG18motyIrJrBLGArcs0YNOn66F5M=; b=pdf0eNr+XEEhx6I7NBLOlzOXh63+Tgzj57OoXc2xEiLr52dDN2Iezc0x/79HwdlArL AcPgvTMday3W8ntpZQMzdo9lUHcaPlEjl/B6Xb9hJYZqLtiAK1IN25puSG2r4LbVR6S5 kv2w6KiQuWddK6b30orD+iPZd5SFWrnaaHl7LW+arNb7MkCbjCFaTL05LJNKMKpz2rIx utYiKKPWQtXPFVIh8tbe/uOIB+X91M5E47jJ/A0oTBzLODRri8QD6or/+GeyrbulYhUU IqSEPbkEDhA/StOHjj8xs9elHvB2uXJgeRHStnGW2GMm8o260oE3K/8be+6+ISPmAmWF dITw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=OmEHlpCk9+kT+4UG18motyIrJrBLGArcs0YNOn66F5M=; b=aqOQ/Bfy19XJJyA/fhWdjibixTFWV38izHzb7ONUbNwbaVOBfh75oRIMnnkzuR2SY0 85/hwUQ/NWrP0NOne7CrHH7mz3cqdvrQJUezMH37YWdn4QExBxPHn/yTkRK/N1/A8moe 8JRtrJzgom4KfU2N+cxhhl2ZpcFqzV4LpmUa+qMssPHSDRXJs58SYsPPIXAnjKH5YWot HqUWrXvlYia0z88vDTbMyyij4HaB+oj+EjVm5agGn0P7a00BNGo+WXQUTbsqyPmUNGWn IGXH6guShmOyh1Co4bUMHfk8cdjS139hHGT+DrbRs2g0C1kAsIjcRcj/7Qe57BLx2AJB R/2w== X-Gm-Message-State: AOAM531d4bJSVeGnCSLdyweHzh0klCfOxhPlZlSeIVmSODaeobuttrRF fsFsqCfYzUWYSF5kNArKI399AXGXfcGH/kwDuVU1FA== X-Google-Smtp-Source: ABdhPJyrQGT67+E2Q0B8IWs/wD6tmHwf9aFFsYLSMb5RypgEguFXNl8rPDiBdZE24YYwgR7k2i2T5YU4Gl16CkxuhVY= X-Received: by 2002:a05:6512:490:b0:443:d65a:2bc8 with SMTP id v16-20020a056512049000b00443d65a2bc8mr19232653lfq.579.1646257693378; Wed, 02 Mar 2022 13:48:13 -0800 (PST) MIME-Version: 1.0 References: <20220302102705.15c32822@gandalf.local.home> <20220302193638.11034-1-ctshao@google.com> In-Reply-To: <20220302193638.11034-1-ctshao@google.com> From: Nick Desaulniers Date: Wed, 2 Mar 2022 13:48:01 -0800 Message-ID: Subject: Re: [PATCH v2] config: Allow kernel installation packaging to override pkg-config To: Chun-Tse Shao Cc: rostedt@goodmis.org, devicetree@vger.kernel.org, frowand.list@gmail.com, jpoimboe@redhat.com, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, masahiroy@kernel.org, michal.lkml@markovi.net, peterz@infradead.org, robh+dt@kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Wed, Mar 2, 2022 at 11:36 AM Chun-Tse Shao wrote: > > Add HOSTPKG_CONFIG to allow tooling that builds the kernel to override > what pkg-config and parameters are used. > > Signed-off-by: Chun-Tse Shao I'm ok with this patch; a quick grep though shows a few more open coded instances of pkg-config. Should we fix those up, too? i.e. certs/Makefile:92:HOSTCFLAGS_extract-cert.o = $(shell pkg-config --cflags libcrypto 2> /dev/null) certs/Makefile:93:HOSTLDLIBS_extract-cert = $(shell pkg-config --libs libcrypto 2> /dev/null || echo -lcrypto) scripts/kconfig/gconf-cfg.sh tools/perf/Makefile.perf tools/ in general > --- > Makefile | 3 ++- > scripts/Makefile | 4 ++-- > scripts/dtc/Makefile | 6 +++--- > tools/objtool/Makefile | 4 ++-- > 4 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/Makefile b/Makefile > index daeb5c88b50b..f6c5bef7e141 100644 > --- a/Makefile > +++ b/Makefile > @@ -430,6 +430,7 @@ else > HOSTCC = gcc > HOSTCXX = g++ > endif > +HOSTPKG_CONFIG = pkg-config > > export KBUILD_USERCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes \ > -O2 -fomit-frame-pointer -std=gnu89 > @@ -525,7 +526,7 @@ KBUILD_LDFLAGS_MODULE := > KBUILD_LDFLAGS := > CLANG_FLAGS := > > -export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC > +export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC HOSTPKG_CONFIG > export CPP AR NM STRIP OBJCOPY OBJDUMP READELF PAHOLE RESOLVE_BTFIDS LEX YACC AWK INSTALLKERNEL > export PERL PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX > export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD > diff --git a/scripts/Makefile b/scripts/Makefile > index ce5aa9030b74..f084f08ed176 100644 > --- a/scripts/Makefile > +++ b/scripts/Makefile > @@ -14,8 +14,8 @@ hostprogs-always-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert > HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include > HOSTLDLIBS_sorttable = -lpthread > HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include > -HOSTCFLAGS_sign-file.o = $(shell pkg-config --cflags libcrypto 2> /dev/null) > -HOSTLDLIBS_sign-file = $(shell pkg-config --libs libcrypto 2> /dev/null || echo -lcrypto) > +HOSTCFLAGS_sign-file.o = $(shell $(HOSTPKG_CONFIG) --cflags libcrypto 2> /dev/null) > +HOSTLDLIBS_sign-file = $(shell $(HOSTPKG_CONFIG) --libs libcrypto 2> /dev/null || echo -lcrypto) > > ifdef CONFIG_UNWINDER_ORC > ifeq ($(ARCH),x86_64) > diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile > index 95aaf7431bff..743fc08827ea 100644 > --- a/scripts/dtc/Makefile > +++ b/scripts/dtc/Makefile > @@ -18,7 +18,7 @@ fdtoverlay-objs := $(libfdt) fdtoverlay.o util.o > # Source files need to get at the userspace version of libfdt_env.h to compile > HOST_EXTRACFLAGS += -I $(srctree)/$(src)/libfdt > > -ifeq ($(shell pkg-config --exists yaml-0.1 2>/dev/null && echo yes),) > +ifeq ($(shell $(HOSTPKG_CONFIG) --exists yaml-0.1 2>/dev/null && echo yes),) > ifneq ($(CHECK_DT_BINDING)$(CHECK_DTBS),) > $(error dtc needs libyaml for DT schema validation support. \ > Install the necessary libyaml development package.) > @@ -27,9 +27,9 @@ HOST_EXTRACFLAGS += -DNO_YAML > else > dtc-objs += yamltree.o > # To include installed in a non-default path > -HOSTCFLAGS_yamltree.o := $(shell pkg-config --cflags yaml-0.1) > +HOSTCFLAGS_yamltree.o := $(shell $(HOSTPKG_CONFIG) --cflags yaml-0.1) > # To link libyaml installed in a non-default path > -HOSTLDLIBS_dtc := $(shell pkg-config yaml-0.1 --libs) > +HOSTLDLIBS_dtc := $(shell $(HOSTPKG_CONFIG) yaml-0.1 --libs) > endif > > # Generated files need one more search path to include headers in source tree > diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile > index 92ce4fce7bc7..549acc5859e9 100644 > --- a/tools/objtool/Makefile > +++ b/tools/objtool/Makefile > @@ -19,8 +19,8 @@ LIBSUBCMD = $(LIBSUBCMD_OUTPUT)libsubcmd.a > OBJTOOL := $(OUTPUT)objtool > OBJTOOL_IN := $(OBJTOOL)-in.o > > -LIBELF_FLAGS := $(shell pkg-config libelf --cflags 2>/dev/null) > -LIBELF_LIBS := $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf) > +LIBELF_FLAGS := $(shell $(HOSTPKG_CONFIG) libelf --cflags 2>/dev/null) > +LIBELF_LIBS := $(shell $(HOSTPKG_CONFIG) libelf --libs 2>/dev/null || echo -lelf) > > all: $(OBJTOOL) > > -- > 2.35.1.574.g5d30c73bfb-goog > -- Thanks, ~Nick Desaulniers