From f3f0ba82c5cb7ecdd6766c454001bf3daca6f30c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 25 Feb 2017 19:51:31 +0100 Subject: [PATCH] Revert "cmake: adjust dependencies added for libuv" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit cmake 3.7 causes serious regressions in some cmake-based packages, related to how RPATH is handled. This reverts commit b754237520a4795eadc0edec768b267dd598ab0e. Signed-off-by: "Yann E. MORIN" Cc: Vicente Olivert Riera Cc: Samuel Martin Cc: Thomas Petazzoni Cc: Jörg Krause Cc: Baruch Siach Signed-off-by: Peter Korsgaard --- package/cmake/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cmake/Config.in b/package/cmake/Config.in index 2706db51fa..716d80ec55 100644 --- a/package/cmake/Config.in +++ b/package/cmake/Config.in @@ -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_NPTL # libuv + depends on BR2_TOOLCHAIN_HAS_THREADS # 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, NPTL" +comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, threads" 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_NPTL + !BR2_TOOLCHAIN_HAS_THREADS -- 2.30.2