Source: cmake
Version: 3.11.2-1
Severity: serious
Tags: patch
Usertags: linux-any, freebsd-any, hurd-any
Hello,
cmake FTBFS with recent a version of libuv1: 1.22.0-x. The build for
most architectures was made 60+ days ago, then with 1.20.3-x. Since
then two upstream versions was released and the specific change was for
1.21.0:
* core: move all include files except uv.h to uv/ (Saúl Ibarra
Corretgé)
The attached patch, Source_Modules_FindLibUV.cmake.diff, fixes the
build for linux-any architectures by looking for libuv header files in
/usr/include/uv in addition to /usr/include/uv-* headers. This patch
also affects #900240 and #905138 and is needed for successful builds.
Index: cmake-3.11.2/Source/Modules/FindLibUV.cmake
===================================================================
--- cmake-3.11.2.orig/Source/Modules/FindLibUV.cmake
+++ cmake-3.11.2/Source/Modules/FindLibUV.cmake
@@ -63,6 +63,8 @@ mark_as_advanced(LibUV_INCLUDE_DIR)
set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+")
if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
+elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")
+ file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h")
file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
else()
