cmake: adjust dependencies added for libuv
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 28 Feb 2017 18:07:25 +0000 (19:07 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Wed, 1 Mar 2017 20:57:14 +0000 (21:57 +0100)
Commit 1ffcf364b6e9894a876dc581a090f87685945412 updated cmake to 3.7.0,
which requires selecting the libuv package. At the time, the libuv
package only depended on BR2_TOOLCHAIN_HAS_THREADS. However, later on,
it was changed in master to depend on BR2_TOOLCHAIN_HAS_THREADS_NPTL, a
change which was not taken into account in the cmake 3.7.0 bump that was
merged in the next branch.

Due to this, builds of cmake is attempted on architectures that don't
provide NPTL thread support, causing a build failure. This commit fixes
that by adjusting the dependency.

Fixes:

  http://autobuild.buildroot.net/results/16a5e1cbb57c0124537c4f3dc0807ba1eaa975ec/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/cmake/Config.in

index 716d80ec55c28a56ff6706991ff214922826c409..2706db51fa268727ab918e0fe066dfff1260e916 100644 (file)
@@ -26,7 +26,7 @@ config BR2_PACKAGE_CMAKE_CTEST
        depends on BR2_USE_WCHAR # libarchive
        depends on BR2_INSTALL_LIBSTDCPP
        depends on !BR2_STATIC_LIBS
-       depends on BR2_TOOLCHAIN_HAS_THREADS # libuv
+       depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
        depends on BR2_USE_MMU # libuv
        help
          CTest is a testing tool distributed as a part of CMake. It
@@ -37,9 +37,9 @@ config BR2_PACKAGE_CMAKE_CTEST
 
          http://www.cmake.org/
 
-comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, threads"
+comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, NPTL"
        depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
        depends on BR2_USE_MMU
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
                BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
-               !BR2_TOOLCHAIN_HAS_THREADS
+               !BR2_TOOLCHAIN_HAS_THREADS_NPTL