| Message ID | 20191103104206.1061-1-yann.morin.1998@free.fr |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/dtc: needs host-pkgconf unconditionally | expand |
On Sun, 3 Nov 2019 11:42:06 +0100 "Yann E. MORIN" <yann.morin.1998@free.fr> wrote: > 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> > --- > package/dtc/dtc.mk | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes: > 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> Committed to 2019.08.x, thanks.
diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk index 7fde0dc968..e0050416ce 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 BSD-2-Clause 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
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> --- package/dtc/dtc.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)