Bläddra i källkod

dependencies.mk: check for valid host-tar before other host dependencies

host-{cmake,lzip,xz} needs host-tar to extract their source code tarball, so
we need to ensure that host-tar gets added to DEPENDENCIES_HOST_PREREQ
before these in case they are both needed, otherwise the tools will fail to
extract.

With the upcoming change to blacklist modern tar versions this situation is
likely to trigger more often.

The real solution to this issue is the <foo>_EXTRACT_DEPENDENCIES rework,
but that series is a bit too intrusive to add this close to 2018.02, so
therefore this hack.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Peter Korsgaard 7 år sedan
förälder
incheckning
7c09cb82b7
1 ändrade filer med 4 tillägg och 1 borttagningar
  1. 4 1
      support/dependencies/dependencies.mk

+ 4 - 1
support/dependencies/dependencies.mk

@@ -12,7 +12,10 @@
 define suitable-host-package
 define suitable-host-package
 $(shell support/dependencies/check-host-$(1).sh $(2))
 $(shell support/dependencies/check-host-$(1).sh $(2))
 endef
 endef
--include $(sort $(wildcard support/dependencies/check-host-*.mk))
+# host utilities needs host-tar to extract the source code tarballs, so
+# ensure check-host-tar.mk is included before the rest
+include support/dependencies/check-host-tar.mk
+-include $(sort $(filter-out %-tar.mk,$(wildcard support/dependencies/check-host-*.mk)))
 
 
 ifeq ($(BR2_CCACHE),y)
 ifeq ($(BR2_CCACHE),y)
 DEPENDENCIES_HOST_PREREQ += host-ccache
 DEPENDENCIES_HOST_PREREQ += host-ccache