commit: 71da15f49a47695ddcb668170a7fbacae924e49b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 24 09:33:04 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jun 24 09:34:30 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71da15f4
dev-util/cmake: Fix src_configure with >=libuv-1.21 Thanks-to: Thomas Deutschmann <whissi <AT> gentoo.org> Closes: https://bugs.gentoo.org/658898 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-util/cmake/cmake-3.11.4.ebuild | 1 + dev-util/cmake/cmake-3.12.0_rc1.ebuild | 1 + dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch | 28 ++++++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/dev-util/cmake/cmake-3.11.4.ebuild b/dev-util/cmake/cmake-3.11.4.ebuild index 050883851f5..b9e25d10709 100644 --- a/dev-util/cmake/cmake-3.11.4.ebuild +++ b/dev-util/cmake/cmake-3.11.4.ebuild @@ -60,6 +60,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch # upstream fixes (can usually be removed with a version bump) + "${FILESDIR}"/${P}-libuv-1.21.patch ) cmake_src_bootstrap() { diff --git a/dev-util/cmake/cmake-3.12.0_rc1.ebuild b/dev-util/cmake/cmake-3.12.0_rc1.ebuild index 050883851f5..2cc5baaef0e 100644 --- a/dev-util/cmake/cmake-3.12.0_rc1.ebuild +++ b/dev-util/cmake/cmake-3.12.0_rc1.ebuild @@ -60,6 +60,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch # upstream fixes (can usually be removed with a version bump) + "${FILESDIR}"/${PN}-3.11.4-libuv-1.21.patch ) cmake_src_bootstrap() { diff --git a/dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch b/dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch new file mode 100644 index 00000000000..664c39aae90 --- /dev/null +++ b/dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch @@ -0,0 +1,28 @@ +From 92c4b3d900a24512967a960f108d985c819fdf00 Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa <[email protected]> +Date: Sat, 23 Jun 2018 20:30:07 +0200 +Subject: [PATCH] FindLibUV: Also check uv/version.h for version detection + +Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory. +Make FindLibUV aware of the file's new location for configuration to work. + +Upstream change: https://github.com/libuv/libuv/pull/1429 +--- + Source/Modules/FindLibUV.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Source/Modules/FindLibUV.cmake b/Source/Modules/FindLibUV.cmake +index ba13d75..0554d62 100644 +--- a/Source/Modules/FindLibUV.cmake ++++ b/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() +-- +libgit2 0.27.0
