Explorar el Código

dependencies: check for extract tools as well

Most of the extract tools (gzip/bzip/..) we already check for explicitly
in dependencies.sh (as they are used outside GENTARGETS), but not for
xzcat.
The .xz format is used fairly rarely, and it is likely to not be available
on build hosts, so an explicit (hardcoded) check for it isn't optimal.
Instead, add the inflate tools used to DL_TOOLS_DEPENDENCIES, similar to
how we do it for svn/git/bzr/...

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard hace 13 años
padre
commit
2c6390a5d0
Se han modificado 2 ficheros con 3 adiciones y 7 borrados
  1. 2 0
      package/Makefile.package.in
  2. 1 7
      toolchain/dependencies/dependencies.mk

+ 2 - 0
package/Makefile.package.in

@@ -726,6 +726,8 @@ else ifeq ($$($(2)_SITE_METHOD),hg)
 DL_TOOLS_DEPENDENCIES += hg
 endif # SITE_METHOD
 
+DL_TOOLS_DEPENDENCIES += $(firstword $(INFLATE$(suffix $($(2)_SOURCE))))
+
 endif # $(2)_KCONFIG_VAR
 endef # GENTARGETS_INNER
 

+ 1 - 7
toolchain/dependencies/dependencies.mk

@@ -10,16 +10,10 @@ ifeq ($(BR2_STRIP_sstrip),y)
 DEPENDENCIES_HOST_PREREQ+=host-sstrip
 endif
 
-# Remove duplicate entries from $(DL_TOOLS_DEPENDENCIES)
-DL_TOOLS = \
-	$(findstring svn,$(DL_TOOLS_DEPENDENCIES)) \
-	$(findstring git,$(DL_TOOLS_DEPENDENCIES)) \
-	$(findstring bzr,$(DL_TOOLS_DEPENDENCIES))
-
 core-dependencies:
 	@HOSTCC="$(firstword $(HOSTCC))" MAKE="$(MAKE)" \
 		CONFIG_FILE="$(CONFIG_DIR)/.config" \
-		DL_TOOLS="$(DL_TOOLS)" \
+		DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \
 		$(TOPDIR)/toolchain/dependencies/dependencies.sh
 
 dependencies: core-dependencies $(DEPENDENCIES_HOST_PREREQ)