Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Jun 2018 18:51:48 +0000 (UTC)
From:      Raphael Kubo da Costa <rakuco@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r473149 - head/devel/cmake/files
Message-ID:  <201806231851.w5NIpmNu070007@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rakuco
Date: Sat Jun 23 18:51:48 2018
New Revision: 473149
URL: https://svnweb.freebsd.org/changeset/ports/473149

Log:
  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

Added:
  head/devel/cmake/files/patch-Source_Modules_FindLibUV.cmake   (contents, props changed)

Added: head/devel/cmake/files/patch-Source_Modules_FindLibUV.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/cmake/files/patch-Source_Modules_FindLibUV.cmake	Sat Jun 23 18:51:48 2018	(r473149)
@@ -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()



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806231851.w5NIpmNu070007>