From b7e1d802bd9d34db3ac71f5a6323d9e1191a74aa Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Sun, 12 Oct 2014 12:25:29 -0500
Subject: libssh: fix 10.10 build

---
 Library/Formula/libssh.rb | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'Library/Formula/libssh.rb')

diff --git a/Library/Formula/libssh.rb b/Library/Formula/libssh.rb
index 457fa7f57..4e411f8a2 100644
--- a/Library/Formula/libssh.rb
+++ b/Library/Formula/libssh.rb
@@ -8,8 +8,6 @@ class Libssh < Formula
 
   head "git://git.libssh.org/projects/libssh.git"
 
-  # Build fails on Yosemite. Upstream: https://red.libssh.org/issues/174
-
   bottle do
     sha1 "84717d23f7d4e59d847bbc2b3b91a2edb9e05709" => :mavericks
     sha1 "92158c3da484ae5073004c9e471bb458c61e08e3" => :mountain_lion
@@ -19,6 +17,11 @@ class Libssh < Formula
   depends_on "cmake" => :build
   depends_on "openssl"
 
+  # Fix compilation on 10.10
+  # https://red.libssh.org/issues/164
+  # https://red.libssh.org/issues/174
+  patch :DATA
+
   def install
     mkdir "build" do
       system "cmake", "..", *std_cmake_args
@@ -26,3 +29,20 @@ class Libssh < Formula
     end
   end
 end
+
+__END__
+diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
+index 8f76af8..0ce7a31 100644
+--- a/ConfigureChecks.cmake
++++ b/ConfigureChecks.cmake
+@@ -101,8 +101,8 @@ check_function_exists(snprintf HAVE_SNPRINTF)
+ check_function_exists(poll HAVE_POLL)
+ check_function_exists(select HAVE_SELECT)
+ check_function_exists(getaddrinfo HAVE_GETADDRINFO)
+-check_function_exists(ntohll HAVE_NTOHLL)
+-check_function_exists(htonll HAVE_HTONLL)
++check_symbol_exists(ntohll arpa/inet.h HAVE_NTOHLL)
++check_symbol_exists(htonll arpa/inet.h HAVE_HTONLL)
+ 
+ if (WIN32)
+     check_function_exists(_strtoui64 HAVE__STRTOUI64)
-- 
cgit v1.2.3