aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2019-11-03 11:42:06 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-11-08 21:57:58 +0100
commit78b77a5c4a5eef1ad5b4af51879758d38a8cc98d (patch)
treea47c3b591277459b1a54e8532e8e4d70762a9bd0
parent6d8c56f77627e594fb285a7c6f4245ed196ce392 (diff)
downloadbuildroot-78b77a5c4a5eef1ad5b4af51879758d38a8cc98d.tar.gz
buildroot-78b77a5c4a5eef1ad5b4af51879758d38a8cc98d.tar.bz2
package/dtc: needs host-pkgconf unconditionally
Commits 495e757d2 (package/dtc: add optional libyaml dependency) and e43d9072a (package/dtc: fix build without libyaml), added a conditional dependency to host-pkgconf, when libyaml is enabled, while commit 56d6dd453 (package/dtc: disable valgrind) explicitly disabled support of valgrind. However, presence of libyaml, as well as that of valgrind, *is* detected by calling pkg-config: NO_VALGRIND := $(shell $(PKG_CONFIG) --exists valgrind; echo $$?) NO_YAML := $(shell $(PKG_CONFIG) --exists yaml-0.1; echo $$?) Passing NO_YAML=1 or NO_VALGRIND=1 do not prevent the tests from being executed, which would yield messages like: /bin/sh: 1: /home/ymorin/dev/buildroot/O/host/bin/pkg-config: not found (note however that, even if the test is executed, the value we pass on the command line still takes precedence, and the support for either is properly disabled.) So, move the dependency on host-pkgconfig out of the condition. Ditto for the host package. Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com> Cc: Titouan Christophe <titouan.christophe@railnova.eu> Cc: Carlos Santos <unixmania@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/dtc/dtc.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk
index a0fffa5b80..96a64b70e4 100644
--- a/package/dtc/dtc.mk
+++ b/package/dtc/dtc.mk
@@ -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_FILES = README.license GPL
DTC_INSTALL_STAGING = YES
-DTC_DEPENDENCIES = host-bison host-flex
-HOST_DTC_DEPENDENCIES = host-bison host-flex
+DTC_DEPENDENCIES = host-bison host-flex host-pkgconf
+HOST_DTC_DEPENDENCIES = host-bison host-flex host-pkgconf
DTC_MAKE_OPTS = \
PREFIX=/usr \
@@ -25,7 +25,7 @@ HOST_DTC_MAKE_OPTS = \
NO_YAML=1
ifeq ($(BR2_PACKAGE_LIBYAML),y)
-DTC_DEPENDENCIES += host-pkgconf libyaml
+DTC_DEPENDENCIES += libyaml
else
DTC_MAKE_OPTS += NO_YAML=1
endif