Commit d5ea4fec authored by Chun-Tse Shao's avatar Chun-Tse Shao Committed by Masahiro Yamada
Browse files

kbuild: Allow kernel installation packaging to override pkg-config 



Add HOSTPKG_CONFIG to allow tooling that builds the kernel to override
what pkg-config and parameters are used.

Signed-off-by: default avatarChun-Tse Shao <ctshao@google.com>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 9a22717b

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -436,6 +436,7 @@ else 
HOSTCC	= gcc

HOSTCXX	= g++

endif

HOSTPKG_CONFIG	= pkg-config



KBUILD_USERHOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes \

			 -O2 -fomit-frame-pointer -std=gnu11 \
@@ -533,7 +534,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

certs/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -74,5 +74,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)

scripts/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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)

scripts/kconfig/gconf-cfg.sh

+6 −6
Original line number Diff line number Diff line
@@ -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 "* 'make gconfig' requires '${HOSTPKG_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)\"

scripts/kconfig/mconf-cfg.sh

+8 −8
Original line number Diff line number Diff line
@@ -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
@@ -46,7 +46,7 @@ echo >&2 "* Unable to find the ncurses package." 
echo >&2 "* Install ncurses (ncurses-devel or libncurses-dev"

echo >&2 "* depending on your distribution)."

echo >&2 "*"

echo >&2 "* You may also need to install pkg-config to find the"

echo >&2 "* You may also need to install ${HOSTPKG_CONFIG} to find the"

echo >&2 "* ncurses installed in a non-default location."

echo >&2 "*"

exit 1