diff options
| author | Andre Heider <a.heider@gmail.com> | 2021-10-13 12:51:22 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-24 18:00:49 +0200 |
| commit | f262d2aae136d2fe60c3b7314a4a0c5f30d79062 (patch) | |
| tree | 6f652454977fc70b63df58eee5d1a63f3f04fd16 | |
| parent | b428f187f0db70a0a7166895ac9d159104ae5708 (diff) | |
| download | upstream-f262d2aae136d2fe60c3b7314a4a0c5f30d79062.tar.gz upstream-f262d2aae136d2fe60c3b7314a4a0c5f30d79062.tar.bz2 upstream-f262d2aae136d2fe60c3b7314a4a0c5f30d79062.zip | |
u-boot.mk: fix pkg-config usage
Using Host/Exports doesn't work as intended, explicitly add the
required vars so that u-boot finds the required libraries when building
its tools.
Signed-off-by: Andre Heider <a.heider@gmail.com>
| -rw-r--r-- | include/u-boot.mk | 3 | ||||
| -rw-r--r-- | package/boot/uboot-mediatek/Makefile | 2 | ||||
| -rw-r--r-- | package/boot/uboot-mvebu/Makefile | 2 | ||||
| -rw-r--r-- | package/boot/uboot-mxs/Makefile | 2 | ||||
| -rw-r--r-- | package/boot/uboot-zynq/Makefile | 2 |
5 files changed, 3 insertions, 8 deletions
diff --git a/include/u-boot.mk b/include/u-boot.mk index c0a1e87bf3d..8c6941b88ac 100644 --- a/include/u-boot.mk +++ b/include/u-boot.mk @@ -45,6 +45,9 @@ UBOOT_MAKE_FLAGS = \ HOSTCC="$(HOSTCC)" \ HOSTCFLAGS="$(HOST_CFLAGS) $(HOST_CPPFLAGS) -std=gnu11" \ HOSTLDFLAGS="$(HOST_LDFLAGS)" \ + STAGING_PREFIX="$(STAGING_DIR_HOST)" \ + PKG_CONFIG_PATH="$(STAGING_DIR_HOST)/lib/pkgconfig" \ + PKG_CONFIG_LIBDIR="$(STAGING_DIR_HOST)/lib/pkgconfig" \ $(if $(findstring c,$(OPENWRT_VERBOSE)),V=1,V='') define Build/U-Boot/Target diff --git a/package/boot/uboot-mediatek/Makefile b/package/boot/uboot-mediatek/Makefile index a5801afa2d3..5d9459d461f 100644 --- a/package/boot/uboot-mediatek/Makefile +++ b/package/boot/uboot-mediatek/Makefile @@ -111,8 +111,6 @@ UBOOT_TARGETS := \ UBOOT_MAKE_FLAGS += $(UBOOT_IMAGE:.fip=.bin) -Build/Exports:=$(Host/Exports) - define Build/fip-image $(STAGING_DIR_HOST)/bin/fiptool create \ --soc-fw $(STAGING_DIR_IMAGE)/$(BUILD_SUBTARGET)-$(BL2_BOOTDEV)-$(BL2_DDRBLOB)ddr-bl31.bin \ diff --git a/package/boot/uboot-mvebu/Makefile b/package/boot/uboot-mvebu/Makefile index bf03fdd2b2a..e2f2a2a3825 100644 --- a/package/boot/uboot-mvebu/Makefile +++ b/package/boot/uboot-mvebu/Makefile @@ -53,8 +53,6 @@ UBOOT_TARGETS:= \ espressobin \ uDPU -Build/Exports:=$(Host/Exports) - define Build/Configure # enable additional options beyond <device>_defconfig echo CONFIG_CMD_SETEXPR=y >> $(PKG_BUILD_DIR)/configs/$(UBOOT_CONFIG)_defconfig diff --git a/package/boot/uboot-mxs/Makefile b/package/boot/uboot-mxs/Makefile index f4211d3a549..3c908874faa 100644 --- a/package/boot/uboot-mxs/Makefile +++ b/package/boot/uboot-mxs/Makefile @@ -38,8 +38,6 @@ UBOOT_TARGETS := \ UBOOT_MAKE_FLAGS += $(UBOOT_IMAGE) -Build/Exports:=$(Host/Exports) - define Build/InstallDev $(INSTALL_DIR) $(STAGING_DIR_IMAGE) $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-$(UBOOT_IMAGE) diff --git a/package/boot/uboot-zynq/Makefile b/package/boot/uboot-zynq/Makefile index b6b1dc8b85f..c605cfaeb2a 100644 --- a/package/boot/uboot-zynq/Makefile +++ b/package/boot/uboot-zynq/Makefile @@ -60,6 +60,4 @@ endef define Package/u-boot/install/default endef -Build/Exports:=$(Host/Exports) - $(eval $(call BuildPackage/U-Boot)) |