From owner-svn-ports-all@FreeBSD.ORG Sun Mar 9 18:42:17 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1378FA6F; Sun, 9 Mar 2014 18:42:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F06F08C0; Sun, 9 Mar 2014 18:42:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s29IgG1k096722; Sun, 9 Mar 2014 18:42:16 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s29IgGDh096720; Sun, 9 Mar 2014 18:42:16 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201403091842.s29IgGDh096720@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 9 Mar 2014 18:42:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347682 - in branches/2014Q1/devel/cmake: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Mar 2014 18:42:17 -0000 Author: rakuco Date: Sun Mar 9 18:42:16 2014 New Revision: 347682 URL: http://svnweb.freebsd.org/changeset/ports/347682 QAT: https://qat.redports.org/buildarchive/r347682/ Log: MFH: r347674 Make the port build with security/openssl installed after r347541. Add a patch sent upstream that makes sure the bundled curl's include paths are passed to the compiler before any other ones, since they could include the system's curl include directory. One way to trigger this was to build the port with security/openssl installed: CMake would detect OpenSSL's include path (${LOCALBASE}/include) and pass it to the compiler. If ftp/curl is also installed, the compiler would end up picking its headers instead of the ones in cmcurl's own directory. Reported by: Terry Kennedy Approved by: portmgr (miwi) Added: branches/2014Q1/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt - copied unchanged from r347674, head/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt Modified: branches/2014Q1/devel/cmake/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/cmake/Makefile ============================================================================== --- branches/2014Q1/devel/cmake/Makefile Sun Mar 9 18:42:11 2014 (r347681) +++ branches/2014Q1/devel/cmake/Makefile Sun Mar 9 18:42:16 2014 (r347682) @@ -3,7 +3,7 @@ PORTNAME= cmake PORTVERSION= 2.8.12.1 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= devel MASTER_SITES= http://downloads.cmake.org/files/v2.8/ Copied: branches/2014Q1/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt (from r347674, head/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt Sun Mar 9 18:42:16 2014 (r347682, copy of r347674, head/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt) @@ -0,0 +1,36 @@ +cmcurl: Include the local curl directories before all others. + +In some cases, it was possible for the include directory of the system-wide +libcurl to be added to the include path before cmcurl's, which would result +in them being picked up and causing the build to fail if the curl versions +differ too much. + +One way to trigger this is to have OpenSSL installed into a non-default +location together with libcurl (/usr/local, for example). If cmcurl is built +with CMAKE_USE_OPENSSL on, -I/usr/local/include would end up being added +before -I${PATH_TO_CMCURL}. + +Sent upstream: http://public.kitware.com/pipermail/cmake-developers/2014-March/010000.html +--- Utilities/cmcurl/CMakeLists.txt ++++ Utilities/cmcurl/CMakeLists.txt +@@ -172,6 +172,11 @@ IF(NOT CURL_SPECIAL_LIBZ) + CHECK_LIBRARY_EXISTS_CONCAT("z" inflateEnd HAVE_LIBZ) + ENDIF(NOT CURL_SPECIAL_LIBZ) + ++# Include the local directories before any others so that we do not end up ++# including system curl's include directory first by mistake. ++INCLUDE_DIRECTORIES(${LIBCURL_SOURCE_DIR}) ++INCLUDE_DIRECTORIES(${LIBCURL_BINARY_DIR}) ++ + OPTION(CMAKE_USE_OPENSSL "Use OpenSSL code with curl." OFF) + MARK_AS_ADVANCED(CMAKE_USE_OPENSSL) + IF(CMAKE_USE_OPENSSL) +@@ -679,8 +684,6 @@ INCLUDE(CMake/OtherTests.cmake) + + # The rest of the build + +-INCLUDE_DIRECTORIES(${LIBCURL_SOURCE_DIR}) +-INCLUDE_DIRECTORIES(${LIBCURL_BINARY_DIR}) + OPTION(CMAKE_BUILD_CURL_SHARED "Should curl be built shared" TRUE) + IF(CMAKE_BUILD_CURL_SHARED) + SET(LIBRARY_TYPE SHARED)