From owner-svn-ports-head@freebsd.org Sat Jun 23 18:51:49 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41F1A1002518; Sat, 23 Jun 2018 18:51:49 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E831C8DFC3; Sat, 23 Jun 2018 18:51:48 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C94FF13C02; Sat, 23 Jun 2018 18:51:48 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5NIpmHr070008; Sat, 23 Jun 2018 18:51:48 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5NIpmNu070007; Sat, 23 Jun 2018 18:51:48 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201806231851.w5NIpmNu070007@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sat, 23 Jun 2018 18:51:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473149 - head/devel/cmake/files X-SVN-Group: ports-head X-SVN-Commit-Author: rakuco X-SVN-Commit-Paths: head/devel/cmake/files X-SVN-Commit-Revision: 473149 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Jun 2018 18:51:49 -0000 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 +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()