diff options
| author | rakuco <rakuco@FreeBSD.org> | 2018-06-24 02:51:48 +0800 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2018-06-24 02:51:48 +0800 |
| commit | 56c50562026f722f1c8b82b0f8a93de2d0e07750 (patch) | |
| tree | 1e3d3a4a775ce582cf905e6ade6443c3f974719c | |
| parent | c97df459f38d3a625067b3b85b388ba71bedc9b0 (diff) | |
| download | freebsd-ports-gnome-56c50562026f722f1c8b82b0f8a93de2d0e07750.tar.gz freebsd-ports-gnome-56c50562026f722f1c8b82b0f8a93de2d0e07750.tar.zst freebsd-ports-gnome-56c50562026f722f1c8b82b0f8a93de2d0e07750.zip | |
Add a patch to unbreak `make configure' with libuv 1.21.0.
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
| -rw-r--r-- | devel/cmake/files/patch-Source_Modules_FindLibUV.cmake | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/devel/cmake/files/patch-Source_Modules_FindLibUV.cmake b/devel/cmake/files/patch-Source_Modules_FindLibUV.cmake new file mode 100644 index 000000000000..f2c13733eca2 --- /dev/null +++ b/devel/cmake/files/patch-Source_Modules_FindLibUV.cmake @@ -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() |