From 578435cabc15c1df11c2ad8e74dfebed2de266bf Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Thu, 29 Jan 2015 20:42:28 +0000 Subject: cmake: fix for openssl 1.0.2 Seems pretty much every CMake project that uses SSL is using the same broken code for finding OpenSSL. Welp. Including CMake themselves. Double welp. This is the upstream patch that will be in the next release, and is in the HEAD already. Closes #36361. Signed-off-by: Mike McQuaid --- Library/Formula/cmake.rb | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) (limited to 'Library/Formula') diff --git a/Library/Formula/cmake.rb b/Library/Formula/cmake.rb index 56b1b5ef1..398be0b6d 100644 --- a/Library/Formula/cmake.rb +++ b/Library/Formula/cmake.rb @@ -20,9 +20,18 @@ end class Cmake < Formula homepage "http://www.cmake.org/" - url "http://www.cmake.org/files/v3.1/cmake-3.1.1.tar.gz" - sha1 "e96098e402903e09f56d0c4cfef516e591088d78" head "http://cmake.org/cmake.git" + revision 1 + + stable do + url "http://www.cmake.org/files/v3.1/cmake-3.1.1.tar.gz" + sha1 "e96098e402903e09f56d0c4cfef516e591088d78" + + # Patching CMake for OpenSSL 1.0.2 + # Already commited upstream, should be in next release & the HEAD. + # http://www.cmake.org/gitweb?p=cmake.git;a=commit;h=de4ccee75a89519f95fcbcca75abc46577bfefea + patch :DATA + end bottle do cellar :any @@ -32,6 +41,7 @@ class Cmake < Formula end option "without-docs", "Don't build man pages" + depends_on :python => :build if MacOS.version <= :snow_leopard && build.with?("docs") depends_on "xz" # For LZMA @@ -104,3 +114,19 @@ class Cmake < Formula system "#{bin}/cmake", "." end end + +__END__ + +diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake +index 340b417..6b4f985 100644 +--- a/Modules/FindOpenSSL.cmake ++++ b/Modules/FindOpenSSL.cmake +@@ -279,7 +279,7 @@ if (OPENSSL_INCLUDE_DIR) + set(OPENSSL_VERSION "${_OPENSSL_VERSION}") + elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") + file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str +- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") ++ REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") + + # The version number is encoded as 0xMNNFFPPS: major minor fix patch status + # The status gives if this is a developer or prerelease and is ignored here. -- cgit v1.2.3