mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-26 23:13:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

package/dtc: add optional libyaml dependency

Browse Source 
Since bump to version 1.5.0 with commit
b2f4dc7bc1, dtc binary optionally depends
on libyaml which is enabled if it is found by pkgconfig so:
 - add host-pkgconf and libyaml dependencies only if
   BR2_PACKAGE_DTC_PROGRAMS and BR2_PACKAGE_LIBYAML are set
 - disable yaml for host build (and so remove host-pkgconf from
   HOST_DTC_DEPENDENCIES)

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2019-07-29 14:16:37 +02:00 committed by Peter Korsgaard
parent ef79770dcd
commit 495e757d20
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/dtc/dtc.mk
View File

@ -10,8 +10,8 @@ DTC_SITE = https://www.kernel.org/pub/software/utils/dtc
DTC_LICENSE = GPL-2.0+ or BSD-2-Clause (library) DTC_LICENSE = GPL-2.0+ or BSD-2-Clause (library)
DTC_LICENSE_FILES = README.license GPL DTC_LICENSE_FILES = README.license GPL
DTC_INSTALL_STAGING = YES DTC_INSTALL_STAGING = YES
DTC_DEPENDENCIES = host-bison host-flex host-pkgconf DTC_DEPENDENCIES = host-bison host-flex
HOST_DTC_DEPENDENCIES = host-bison host-flex host-pkgconf HOST_DTC_DEPENDENCIES = host-bison host-flex
DTC_MAKE_OPTS = \ DTC_MAKE_OPTS = \
PREFIX=/usr \ PREFIX=/usr \
@ -19,7 +19,8 @@ DTC_MAKE_OPTS = \
HOST_DTC_MAKE_OPTS = \ HOST_DTC_MAKE_OPTS = \
PREFIX=$(HOST_DIR) \ PREFIX=$(HOST_DIR) \
NO_PYTHON=1 NO_PYTHON=1 \
NO_YAML=1
define DTC_POST_INSTALL_TARGET_RM_DTDIFF define DTC_POST_INSTALL_TARGET_RM_DTDIFF
rm -f $(TARGET_DIR)/usr/bin/dtdiff rm -f $(TARGET_DIR)/usr/bin/dtdiff
@ -33,6 +34,10 @@ ifeq ($(BR2_PACKAGE_BASH),)
DTC_POST_INSTALL_TARGET_HOOKS += DTC_POST_INSTALL_TARGET_RM_DTDIFF DTC_POST_INSTALL_TARGET_HOOKS += DTC_POST_INSTALL_TARGET_RM_DTDIFF
endif endif
ifeq ($(BR2_PACKAGE_LIBYAML),y)
DTC_DEPENDENCIES += host-pkgconf libyaml
endif
else # $(BR2_PACKAGE_DTC_PROGRAMS) != y else # $(BR2_PACKAGE_DTC_PROGRAMS) != y
DTC_INSTALL_GOAL = install-lib DTC_INSTALL_GOAL = install-lib