package/dtc: fix build without libyaml

- Pass NO_YAML=1 to make when libyaml is disabled
- Move BR2_PACKAGE_LIBYAML block outside
  BR2_PACKAGE_DTC_PROGRAMS block to avoid duplicating NO_YAML=1 even if
  libyaml is only used / needed with dtc program

Fixes:
 - http://autobuild.buildroot.org/results/68a1ba8d615951931567bc8a409c1d16624c902b

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2019-08-13 20:02:25 +02:00 committed by Thomas Petazzoni
parent 9741de8466
commit e43d9072aa

View File

@ -24,6 +24,12 @@ HOST_DTC_MAKE_OPTS = \
NO_VALGRIND=1 \
NO_YAML=1
ifeq ($(BR2_PACKAGE_LIBYAML),y)
DTC_DEPENDENCIES += host-pkgconf libyaml
else
DTC_MAKE_OPTS += NO_YAML=1
endif
define DTC_POST_INSTALL_TARGET_RM_DTDIFF
rm -f $(TARGET_DIR)/usr/bin/dtdiff
endef
@ -36,10 +42,6 @@ ifeq ($(BR2_PACKAGE_BASH),)
DTC_POST_INSTALL_TARGET_HOOKS += DTC_POST_INSTALL_TARGET_RM_DTDIFF
endif
ifeq ($(BR2_PACKAGE_LIBYAML),y)
DTC_DEPENDENCIES += host-pkgconf libyaml
endif
else # $(BR2_PACKAGE_DTC_PROGRAMS) != y
DTC_INSTALL_GOAL = install-lib