Browse Source

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 <libfdt.h>
      |          ^~~~~~~~~~
compilation terminated.

Fixes: http://autobuild.buildroot.net/results/2677c69ac34642a7a501230e1dd22b193db0899d/
Signed-off-by: Maksim Kiselev <bigunclemax@gmail.com>
Reviewed-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Tested-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Maksim Kiselev 2 years ago
parent
commit
6e863bdef4

+ 1 - 0
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
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb
 	select BR2_PACKAGE_DTC
 	select BR2_PACKAGE_DTC
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB
+	select BR2_PACKAGE_ZLIB
 	help
 	help
 	  The sunxi-fel command can interact with a sunxi device in
 	  The sunxi-fel command can interact with a sunxi device in
 	  fel mode. This allows do download code to memory and execute
 	  fel mode. This allows do download code to memory and execute

+ 1 - 0
package/sunxi-tools/Config.in.host

@@ -2,6 +2,7 @@ config BR2_PACKAGE_HOST_SUNXI_TOOLS
 	bool "host sunxi-tools"
 	bool "host sunxi-tools"
 	depends on BR2_arm
 	depends on BR2_arm
 	depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb
 	depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb
+	select BR2_PACKAGE_HOST_DTC
 	help
 	help
 	  Tools for Allwinner A10 (aka sun4i) and A13 (aka sun5i)
 	  Tools for Allwinner A10 (aka sun4i) and A13 (aka sun5i)
 	  based devices. This includes fex2bin which can be used to
 	  based devices. This includes fex2bin which can be used to

+ 4 - 3
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_SITE = $(call github,linux-sunxi,sunxi-tools,v$(SUNXI_TOOLS_VERSION))
 SUNXI_TOOLS_LICENSE = GPL-2.0+
 SUNXI_TOOLS_LICENSE = GPL-2.0+
 SUNXI_TOOLS_LICENSE_FILES = LICENSE.md
 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
 FEX2BIN = $(HOST_DIR)/bin/fex2bin
 
 
 SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_FEXC) += sunxi-fexc
 SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_FEXC) += sunxi-fexc
@@ -26,13 +26,14 @@ SUNXI_TOOLS_FEXC_LINKS += fex2bin bin2fex
 endif
 endif
 
 
 ifeq ($(BR2_PACKAGE_SUNXI_TOOLS_FEL),y)
 ifeq ($(BR2_PACKAGE_SUNXI_TOOLS_FEL),y)
-SUNXI_TOOLS_DEPENDENCIES += dtc libusb host-pkgconf
+SUNXI_TOOLS_DEPENDENCIES += dtc libusb zlib host-pkgconf
 endif
 endif
 
 
 define HOST_SUNXI_TOOLS_BUILD_CMDS
 define HOST_SUNXI_TOOLS_BUILD_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) CROSS_COMPILE="" CC="$(HOSTCC)" \
 	$(HOST_MAKE_ENV) $(MAKE) CROSS_COMPILE="" CC="$(HOSTCC)" \
 		PREFIX=$(HOST_DIR) EXTRA_CFLAGS="$(HOST_CFLAGS)" \
 		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
 endef
 
 
 define HOST_SUNXI_TOOLS_INSTALL_CMDS
 define HOST_SUNXI_TOOLS_INSTALL_CMDS