sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add a patch to unbreak `make configure' with libuv 1.21.0.

Browse source 
r473142 updated libuv and broke CMake. The new release moved internal headers
to the uv/ directory, and CMake needs to be taught about it.

Not bumping PORTREVISION as FindLibUV.cmake is not installed and no builds with
the new libuv could have worked before.

PR:		229255
This commit is contained in:
Raphael Kubo da Costa 2018-06-23 18:51:48 +00:00
parent 23d94a4d65
commit 7db1aa2808
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=473149
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
devel/cmake/files/patch-Source_Modules_FindLibUV.cmake Normal file
View file

@ -0,0 +1,24 @@
Sent upstream: https://gitlab.kitware.com/cmake/cmake/merge_requests/2169
commit 6ad09a5d14ef497cca653d303c3849f83aa0aca3
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sat Jun 23 20:30:07 2018 +0200
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
+++ 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()