Skip to content

Commit

Permalink
cmake: adjust dependencies added for libuv
Browse files Browse the repository at this point in the history
Commit 1ffcf36 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>
  • Loading branch information
tpetazzoni committed Dec 7, 2016
1 parent d64627e commit b754237
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions package/cmake/Config.in
Expand Up @@ -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
Expand All @@ -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

0 comments on commit b754237

Please sign in to comment.