From: Luca Ceresoli Date: Fri, 1 Jul 2016 15:53:28 +0000 (+0200) Subject: cmake: move the host-pkgconf dependency from host-cmake to pkg-cmake X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6ab3383f76c4e9f7151c4fce103e5ff7d5b6eb98;p=buildroot.git cmake: move the host-pkgconf dependency from host-cmake to pkg-cmake In 3d475ee0ba4d6eea6aca25594cfe5bb153ac804f a dependency on host-pkgconf was added to host-cmake. It is a workaround to fix build failures for packages that use pkgconf through a cmake module, but do not depend on host-pkgconf as they should. Since it is the package that needs host-pkgconf and not host-cmake itself, move the dependency to the proper place, in pkg-cmake.mk. Also copy the explanation on the mentioned commit as a comment in order to clarify why we do this. Signed-off-by: Luca Ceresoli Cc: Samuel Martin Cc: Thomas Petazzoni Cc: Davide Viti Cc: Arnout Vandecappelle Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: "Yann E. MORIN" [Thomas: - update on top of master - drop empty HOST_CMAKE_DEPENDENCIES, no longer needed since host dependencies are no longer derived from target dependencies.] Signed-off-by: Thomas Petazzoni --- diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index a776b147e0..95c73c036b 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -10,7 +10,6 @@ CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3c CMAKE_LICENSE_FILES = Copyright.txt -HOST_CMAKE_DEPENDENCIES = host-pkgconf CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz CMAKE_CONF_OPTS = \ diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 9291523eab..4c6dc62270 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -142,6 +142,10 @@ endef endif endif +# Since some CMake modules (even upstream ones) use pgk_check_modules +# primitives to find {C,LD}FLAGS, add it to the dependency list. +$(2)_DEPENDENCIES += host-pkgconf + $(2)_DEPENDENCIES += host-cmake #