From 6e863bdef45c3f4ffabcc8d007f658ea04cb9908 Mon Sep 17 00:00:00 2001 From: Maksim Kiselev Date: Thu, 27 Apr 2023 23:28:02 +0300 Subject: [PATCH] package/sunxi-tools: fix build dependencies This patch fixes the dependency on libfdt for host-sunxi-tools. Also it fixes the dependency on zlib for sunxi-tools. Fix the following host build failure raised since commit 2e330dff6a7ce7965ceb0dccdc9dcbcb329167bb fit_image.c:19:10: fatal error: libfdt.h: No such file or directory 19 | #include | ^~~~~~~~~~ compilation terminated. Fixes: http://autobuild.buildroot.net/results/2677c69ac34642a7a501230e1dd22b193db0899d/ Signed-off-by: Maksim Kiselev Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/sunxi-tools/Config.in | 1 + package/sunxi-tools/Config.in.host | 1 + package/sunxi-tools/sunxi-tools.mk | 7 ++++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/sunxi-tools/Config.in b/package/sunxi-tools/Config.in index e748637c72..14f7da5bf2 100644 --- a/package/sunxi-tools/Config.in +++ b/package/sunxi-tools/Config.in @@ -27,6 +27,7 @@ config BR2_PACKAGE_SUNXI_TOOLS_FEL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_DTC select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_ZLIB help The sunxi-fel command can interact with a sunxi device in fel mode. This allows do download code to memory and execute diff --git a/package/sunxi-tools/Config.in.host b/package/sunxi-tools/Config.in.host index 51f13cf623..f7c60b37a9 100644 --- a/package/sunxi-tools/Config.in.host +++ b/package/sunxi-tools/Config.in.host @@ -2,6 +2,7 @@ config BR2_PACKAGE_HOST_SUNXI_TOOLS bool "host sunxi-tools" depends on BR2_arm depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb + select BR2_PACKAGE_HOST_DTC help Tools for Allwinner A10 (aka sun4i) and A13 (aka sun5i) based devices. This includes fex2bin which can be used to diff --git a/package/sunxi-tools/sunxi-tools.mk b/package/sunxi-tools/sunxi-tools.mk index a9569f2910..97863efc13 100644 --- a/package/sunxi-tools/sunxi-tools.mk +++ b/package/sunxi-tools/sunxi-tools.mk @@ -8,7 +8,7 @@ SUNXI_TOOLS_VERSION = 1.4.2-168-ged3039cdbeeb28fc0011c3585d8f7dfb91038292 SUNXI_TOOLS_SITE = $(call github,linux-sunxi,sunxi-tools,v$(SUNXI_TOOLS_VERSION)) SUNXI_TOOLS_LICENSE = GPL-2.0+ SUNXI_TOOLS_LICENSE_FILES = LICENSE.md -HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb host-pkgconf +HOST_SUNXI_TOOLS_DEPENDENCIES = host-dtc host-libzlib host-libusb host-pkgconf FEX2BIN = $(HOST_DIR)/bin/fex2bin SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_FEXC) += sunxi-fexc @@ -26,13 +26,14 @@ SUNXI_TOOLS_FEXC_LINKS += fex2bin bin2fex endif ifeq ($(BR2_PACKAGE_SUNXI_TOOLS_FEL),y) -SUNXI_TOOLS_DEPENDENCIES += dtc libusb host-pkgconf +SUNXI_TOOLS_DEPENDENCIES += dtc libusb zlib host-pkgconf endif define HOST_SUNXI_TOOLS_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) CROSS_COMPILE="" CC="$(HOSTCC)" \ PREFIX=$(HOST_DIR) EXTRA_CFLAGS="$(HOST_CFLAGS)" \ - LDFLAGS="$(HOST_LDFLAGS)" -C $(@D) tools misc + LDFLAGS="$(HOST_LDFLAGS) -I$(HOST_DIR)/include/libfdt" \ + -C $(@D) tools misc endef define HOST_SUNXI_TOOLS_INSTALL_CMDS