linux/linux.mk: use HOST_MAKE_ENV rather than TARGET_MAKE_ENV
PATCH 1/1 linux/linux.mk: use HOST_MAKE_ENV rather than TARGET_MAKE_ENV
While the kernel is built for the target, the build may need various host libraries depending on config (and kernel version), so use HOST_MAKE_ENV instead of TARGET_MAKE_ENV.
In particular, this ensures that our host-pkgconf will look for host libraries and not target ones.
Fixes building scripts/dtc for Buildroot configurations enabling libyaml and host-pkgconf for kernels after commit 067c650c45 (dtc: Use pkg-config to locate libyaml).
With this enabled, we can drop the PKG_CONFIG_* variables for the _NEEDS_HOST_LIBELF conditional, as those are included in HOST_MAKE_ENV.
--- linux/linux.mk | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
linux/linux.mk +5 -7
@@ -60,8 +60,12 @@ BR_NO_CHECK_HASH_FOR += $(notdir $(LINUX_PATCHES)) # be directories in the patch list (unlike for other packages). LINUX_PATCH = $(filter ftp://% http://% https://%,$(LINUX_PATCHES)) +# while the kernel is built for the target, the build may need various +# host libraries depending on config (and version), so use +# HOST_MAKE_ENV here. In particular, this ensures that our +# host-pkgconf will look for host libraries and not target ones. LINUX_MAKE_ENV = \ - $(TARGET_MAKE_ENV) \ + $(HOST_MAKE_ENV) \ BR_BINARIES_DIR=$(BINARIES_DIR) LINUX_INSTALL_IMAGES = YES
@@ -102,12 +106,6 @@ endif ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF),y) LINUX_DEPENDENCIES += host-elfutils host-pkgconf -LINUX_MAKE_ENV += \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - 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" endif # If host-uboot-tools is selected by the user, assume it is needed to
Signature · 1 line
2.20.1
Thomas Petazzoni
AppliedPATCH 1/1 linux/linux.mk: use HOST_MAKE_ENV rather than TARGET_MAKE_ENV
Quoted 11 lines · On Fri, 31 Jan 2020 18:49:39 +0100 Peter Korsgaard <[email protected]> wrote:
While the kernel is built for the target, the build may need various host libraries depending on config (and kernel version), so use
HOST_MAKE_ENVinstead ofTARGET_MAKE_ENV.In particular, this ensures that our host-pkgconf will look for host libraries and not target ones.
Fixes building
scripts/dtcfor Buildroot configurations enabling libyaml and host-pkgconf for kernels after commit067c650c45(dtc: Use pkg-config to locate libyaml).
Quoted 7 lines
With this enabled, we can drop the PKG_CONFIG_* variables for the
_NEEDS_HOST_LIBELFconditional, as those are included inHOST_MAKE_ENV.Signed-off-by Peter Korsgaard <[email protected]>--- linux/linux.mk | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 linux/linux.mk: use HOST_MAKE_ENV rather than TARGET_MAKE_ENV
In reply to Peter KorsgaardQuoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
While the kernel is built for the target, the build may need various host libraries depending on config (and kernel version), so use
HOST_MAKE_ENVinstead ofTARGET_MAKE_ENV.In particular, this ensures that our host-pkgconf will look for host libraries and not target ones.
Quoted 8 lines
Fixes building
scripts/dtcfor Buildroot configurations enabling libyaml and host-pkgconf for kernels after commit067c650c45(dtc: Use pkg-config to locate libyaml).With this enabled, we can drop the PKG_CONFIG_* variables for the
_NEEDS_HOST_LIBELFconditional, as those are included inHOST_MAKE_ENV.Signed-off-by Peter Korsgaard <[email protected]>
Committed to 2019.02.x and 2019.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard