* [PATCH] config: Using HOSTPKG_CONFIG prefix for pkg-config @ 2022-03-01 23:06 Chun-Tse Shao 2022-03-02 14:18 ` Rob Herring 0 siblings, 1 reply; 8+ messages in thread From: Chun-Tse Shao @ 2022-03-01 23:06 UTC (permalink / raw) To: linux-kernel Cc: ctshao, rostedt, Masahiro Yamada, Michal Marek, Nick Desaulniers, Rob Herring, Frank Rowand, Josh Poimboeuf, Peter Zijlstra, linux-kbuild, devicetree In some parts, pkg-config does not use appropriate $BUILDROOT prefix. The patch adds HOSTPKG_CONFIG prefix for pkg-config to fix the issue. Signed-off-by: Chun-Tse Shao <ctshao@google.com> --- 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 <yaml.h> 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 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] config: Using HOSTPKG_CONFIG prefix for pkg-config 2022-03-01 23:06 [PATCH] config: Using HOSTPKG_CONFIG prefix for pkg-config Chun-Tse Shao @ 2022-03-02 14:18 ` Rob Herring 2022-03-02 15:27 ` Steven Rostedt 0 siblings, 1 reply; 8+ messages in thread From: Rob Herring @ 2022-03-02 14:18 UTC (permalink / raw) To: Chun-Tse Shao Cc: linux-kernel, Steven Rostedt, Masahiro Yamada, Michal Marek, Nick Desaulniers, Frank Rowand, Josh Poimboeuf, Peter Zijlstra, Linux Kbuild mailing list, devicetree On Tue, Mar 1, 2022 at 5:07 PM Chun-Tse Shao <ctshao@google.com> wrote: > > In some parts, pkg-config does not use appropriate $BUILDROOT prefix. The kernel tree knows nothing about buildroot. Please reword this in a more generic way that you need to override the host pkg-config. > The patch adds HOSTPKG_CONFIG prefix for pkg-config to fix the issue. > > Signed-off-by: Chun-Tse Shao <ctshao@google.com> > --- > 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 <yaml.h> 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 > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] config: Using HOSTPKG_CONFIG prefix for pkg-config 2022-03-02 14:18 ` Rob Herring @ 2022-03-02 15:27 ` Steven Rostedt 2022-03-02 19:36 ` [PATCH v2] config: Allow kernel installation packaging to override pkg-config Chun-Tse Shao 0 siblings, 1 reply; 8+ messages in thread From: Steven Rostedt @ 2022-03-02 15:27 UTC (permalink / raw) To: Rob Herring Cc: Chun-Tse Shao, linux-kernel, Masahiro Yamada, Michal Marek, Nick Desaulniers, Frank Rowand, Josh Poimboeuf, Peter Zijlstra, Linux Kbuild mailing list, devicetree On Wed, 2 Mar 2022 08:18:15 -0600 Rob Herring <robh+dt@kernel.org> wrote: > On Tue, Mar 1, 2022 at 5:07 PM Chun-Tse Shao <ctshao@google.com> wrote: > > > > In some parts, pkg-config does not use appropriate $BUILDROOT prefix. > > The kernel tree knows nothing about buildroot. Please reword this in a > more generic way that you need to override the host pkg-config. I don't even know what $BUILDROOT is ;-) But I do know that it's good practice to allow pkg-config to be overridden. I have several user space tools that needed it done to allow distros to install them properly. Would you be OK with a description like: Allow kernel installation packaging to override pkg-config. ? > > > The patch adds HOSTPKG_CONFIG prefix for pkg-config to fix the issue. A couple of things. It is consider poor form to reference "the patch". Another thing is that this is not a prefix for pkg-config, it is overriding what pkg-config is used during the build process. Add HOSTPKG_CONFIG to allow tooling that builds the kernel to override what pkg-config and parameters are used. Something like that. -- Steve > > > > Signed-off-by: Chun-Tse Shao <ctshao@google.com> ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2] config: Allow kernel installation packaging to override pkg-config 2022-03-02 15:27 ` Steven Rostedt @ 2022-03-02 19:36 ` Chun-Tse Shao 2022-03-02 21:48 ` Nick Desaulniers 0 siblings, 1 reply; 8+ messages in thread From: Chun-Tse Shao @ 2022-03-02 19:36 UTC (permalink / raw) To: rostedt Cc: ctshao, devicetree, frowand.list, jpoimboe, linux-kbuild, linux-kernel, masahiroy, michal.lkml, ndesaulniers, peterz, robh+dt 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 <ctshao@google.com> --- 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 <yaml.h> 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 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2] config: Allow kernel installation packaging to override pkg-config 2022-03-02 19:36 ` [PATCH v2] config: Allow kernel installation packaging to override pkg-config Chun-Tse Shao @ 2022-03-02 21:48 ` Nick Desaulniers 2022-03-03 12:42 ` Steven Rostedt 0 siblings, 1 reply; 8+ messages in thread From: Nick Desaulniers @ 2022-03-02 21:48 UTC (permalink / raw) To: Chun-Tse Shao Cc: rostedt, devicetree, frowand.list, jpoimboe, linux-kbuild, linux-kernel, masahiroy, michal.lkml, peterz, robh+dt On Wed, Mar 2, 2022 at 11:36 AM Chun-Tse Shao <ctshao@google.com> 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 <ctshao@google.com> 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 <yaml.h> 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] config: Allow kernel installation packaging to override pkg-config 2022-03-02 21:48 ` Nick Desaulniers @ 2022-03-03 12:42 ` Steven Rostedt 2022-03-03 18:41 ` Nick Desaulniers 0 siblings, 1 reply; 8+ messages in thread From: Steven Rostedt @ 2022-03-03 12:42 UTC (permalink / raw) To: Nick Desaulniers Cc: Chun-Tse Shao, devicetree, frowand.list, jpoimboe, linux-kbuild, linux-kernel, masahiroy, michal.lkml, peterz, robh+dt On Wed, 2 Mar 2022 13:48:01 -0800 Nick Desaulniers <ndesaulniers@google.com> wrote: > 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 For this patch set, the above is probably good enough to do (and test with a make allmodconfig). > tools/perf/Makefile.perf > tools/ in general I would hold off on doing tools for a separate patch. With the exception of objtool most of tools is not needed for the build process. -- Steve ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] config: Allow kernel installation packaging to override pkg-config 2022-03-03 12:42 ` Steven Rostedt @ 2022-03-03 18:41 ` Nick Desaulniers 2022-03-03 23:50 ` [PATCH v3] " Chun-Tse Shao 0 siblings, 1 reply; 8+ messages in thread From: Nick Desaulniers @ 2022-03-03 18:41 UTC (permalink / raw) To: Steven Rostedt, Chun-Tse Shao Cc: devicetree, frowand.list, jpoimboe, linux-kbuild, linux-kernel, masahiroy, michal.lkml, peterz, robh+dt On Thu, Mar 3, 2022 at 4:42 AM Steven Rostedt <rostedt@goodmis.org> wrote: > > On Wed, 2 Mar 2022 13:48:01 -0800 > Nick Desaulniers <ndesaulniers@google.com> wrote: > > > 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 > > For this patch set, the above is probably good enough to do (and test > with a make allmodconfig). > > > tools/perf/Makefile.perf > > tools/ in general > > I would hold off on doing tools for a separate patch. With the > exception of objtool most of tools is not needed for the build process. SGTM -- Thanks, ~Nick Desaulniers ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3] config: Allow kernel installation packaging to override pkg-config 2022-03-03 18:41 ` Nick Desaulniers @ 2022-03-03 23:50 ` Chun-Tse Shao 0 siblings, 0 replies; 8+ messages in thread From: Chun-Tse Shao @ 2022-03-03 23:50 UTC (permalink / raw) To: rostedt, ndesaulniers Cc: ctshao, Masahiro Yamada, Michal Marek, David Howells, David Woodhouse, Rob Herring, Frank Rowand, Josh Poimboeuf, Peter Zijlstra, linux-kbuild, linux-kernel, keyrings, devicetree 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 <ctshao@google.com> --- Changes in v3: - Fix more open coded instance of pkg-config in scripts and certs - Tested with make allmodconfig Changes in v2: - Make the commit message more clearer. --- Makefile | 3 ++- certs/Makefile | 4 ++-- scripts/Makefile | 4 ++-- scripts/dtc/Makefile | 6 +++--- scripts/kconfig/gconf-cfg.sh | 10 +++++----- scripts/kconfig/mconf-cfg.sh | 14 +++++++------- scripts/kconfig/nconf-cfg.sh | 14 +++++++------- scripts/kconfig/qconf-cfg.sh | 14 +++++++------- tools/objtool/Makefile | 4 ++-- 9 files changed, 37 insertions(+), 36 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/certs/Makefile b/certs/Makefile index 3ea7fe60823f..fa540d14ef2d 100644 --- a/certs/Makefile +++ b/certs/Makefile @@ -89,5 +89,5 @@ targets += x509_revocation_list hostprogs := extract-cert -HOSTCFLAGS_extract-cert.o = $(shell pkg-config --cflags libcrypto 2> /dev/null) -HOSTLDLIBS_extract-cert = $(shell pkg-config --libs libcrypto 2> /dev/null || echo -lcrypto) +HOSTCFLAGS_extract-cert.o = $(shell $(HOSTPKG_CONFIG) --cflags libcrypto 2> /dev/null) +HOSTLDLIBS_extract-cert = $(shell $(HOSTPKG_CONFIG) --libs libcrypto 2> /dev/null || echo -lcrypto) 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 <yaml.h> 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/scripts/kconfig/gconf-cfg.sh b/scripts/kconfig/gconf-cfg.sh index 480ecd8b9f41..267ef6012203 100755 --- a/scripts/kconfig/gconf-cfg.sh +++ b/scripts/kconfig/gconf-cfg.sh @@ -3,14 +3,14 @@ PKG="gtk+-2.0 gmodule-2.0 libglade-2.0" -if [ -z "$(command -v pkg-config)" ]; then +if [ -z "$(command -v $(HOSTPKG_CONFIG))" ]; then echo >&2 "*" echo >&2 "* 'make gconfig' requires 'pkg-config'. Please install it." echo >&2 "*" exit 1 fi -if ! pkg-config --exists $PKG; then +if ! $(HOSTPKG_CONFIG) --exists $PKG; then echo >&2 "*" echo >&2 "* Unable to find the GTK+ installation. Please make sure that" echo >&2 "* the GTK+ 2.0 development package is correctly installed." @@ -19,12 +19,12 @@ if ! pkg-config --exists $PKG; then exit 1 fi -if ! pkg-config --atleast-version=2.0.0 gtk+-2.0; then +if ! $(HOSTPKG_CONFIG) --atleast-version=2.0.0 gtk+-2.0; then echo >&2 "*" echo >&2 "* GTK+ is present but version >= 2.0.0 is required." echo >&2 "*" exit 1 fi -echo cflags=\"$(pkg-config --cflags $PKG)\" -echo libs=\"$(pkg-config --libs $PKG)\" +echo cflags=\"$($(HOSTPKG_CONFIG) --cflags $PKG)\" +echo libs=\"$($(HOSTPKG_CONFIG) --libs $PKG)\" diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh index b520e407a8eb..21e40e9a7cd6 100755 --- a/scripts/kconfig/mconf-cfg.sh +++ b/scripts/kconfig/mconf-cfg.sh @@ -4,16 +4,16 @@ PKG="ncursesw" PKG2="ncurses" -if [ -n "$(command -v pkg-config)" ]; then - if pkg-config --exists $PKG; then - echo cflags=\"$(pkg-config --cflags $PKG)\" - echo libs=\"$(pkg-config --libs $PKG)\" +if [ -n "$(command -v $(HOSTPKG_CONFIG))" ]; then + if $(HOSTPKG_CONFIG) --exists $PKG; then + echo cflags=\"$($(HOSTPKG_CONFIG) --cflags $PKG)\" + echo libs=\"$($(HOSTPKG_CONFIG) --libs $PKG)\" exit 0 fi - if pkg-config --exists $PKG2; then - echo cflags=\"$(pkg-config --cflags $PKG2)\" - echo libs=\"$(pkg-config --libs $PKG2)\" + if $(HOSTPKG_CONFIG) --exists $PKG2; then + echo cflags=\"$($(HOSTPKG_CONFIG) --cflags $PKG2)\" + echo libs=\"$($(HOSTPKG_CONFIG) --libs $PKG2)\" exit 0 fi fi diff --git a/scripts/kconfig/nconf-cfg.sh b/scripts/kconfig/nconf-cfg.sh index c212255070c0..eec46e627e5c 100755 --- a/scripts/kconfig/nconf-cfg.sh +++ b/scripts/kconfig/nconf-cfg.sh @@ -4,16 +4,16 @@ PKG="ncursesw menuw panelw" PKG2="ncurses menu panel" -if [ -n "$(command -v pkg-config)" ]; then - if pkg-config --exists $PKG; then - echo cflags=\"$(pkg-config --cflags $PKG)\" - echo libs=\"$(pkg-config --libs $PKG)\" +if [ -n "$(command -v $(HOSTPKG_CONFIG))" ]; then + if $(HOSTPKG_CONFIG) --exists $PKG; then + echo cflags=\"$($(HOSTPKG_CONFIG) --cflags $PKG)\" + echo libs=\"$($(HOSTPKG_CONFIG) --libs $PKG)\" exit 0 fi - if pkg-config --exists $PKG2; then - echo cflags=\"$(pkg-config --cflags $PKG2)\" - echo libs=\"$(pkg-config --libs $PKG2)\" + if $(HOSTPKG_CONFIG) --exists $PKG2; then + echo cflags=\"$($(HOSTPKG_CONFIG) --cflags $PKG2)\" + echo libs=\"$($(HOSTPKG_CONFIG) --libs $PKG2)\" exit 0 fi fi diff --git a/scripts/kconfig/qconf-cfg.sh b/scripts/kconfig/qconf-cfg.sh index fa564cd795b7..839b45b5746e 100755 --- a/scripts/kconfig/qconf-cfg.sh +++ b/scripts/kconfig/qconf-cfg.sh @@ -3,22 +3,22 @@ PKG="Qt5Core Qt5Gui Qt5Widgets" -if [ -z "$(command -v pkg-config)" ]; then +if [ -z "$(command -v $(HOSTPKG_CONFIG))" ]; then echo >&2 "*" - echo >&2 "* 'make xconfig' requires 'pkg-config'. Please install it." + echo >&2 "* 'make xconfig' requires '$(HOSTPKG_CONFIG)'. Please install it." echo >&2 "*" exit 1 fi -if pkg-config --exists $PKG; then - echo cflags=\"-std=c++11 -fPIC $(pkg-config --cflags $PKG)\" - echo libs=\"$(pkg-config --libs $PKG)\" - echo moc=\"$(pkg-config --variable=host_bins Qt5Core)/moc\" +if $(HOSTPKG_CONFIG) --exists $PKG; then + echo cflags=\"-std=c++11 -fPIC $($(HOSTPKG_CONFIG) --cflags $PKG)\" + echo libs=\"$($(HOSTPKG_CONFIG) --libs $PKG)\" + echo moc=\"$($(HOSTPKG_CONFIG) --variable=host_bins Qt5Core)/moc\" exit 0 fi echo >&2 "*" -echo >&2 "* Could not find Qt5 via pkg-config." +echo >&2 "* Could not find Qt5 via $(HOSTPKG_CONFIG)." echo >&2 "* Please install Qt5 and make sure it's in PKG_CONFIG_PATH" echo >&2 "*" exit 1 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.616.g0bdcbb4464-goog ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-03-03 23:50 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-03-01 23:06 [PATCH] config: Using HOSTPKG_CONFIG prefix for pkg-config Chun-Tse Shao 2022-03-02 14:18 ` Rob Herring 2022-03-02 15:27 ` Steven Rostedt 2022-03-02 19:36 ` [PATCH v2] config: Allow kernel installation packaging to override pkg-config Chun-Tse Shao 2022-03-02 21:48 ` Nick Desaulniers 2022-03-03 12:42 ` Steven Rostedt 2022-03-03 18:41 ` Nick Desaulniers 2022-03-03 23:50 ` [PATCH v3] " Chun-Tse Shao
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).