diff options
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/zookeeper.rb | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/Library/Formula/zookeeper.rb b/Library/Formula/zookeeper.rb index 456c20828..fa074e85e 100644 --- a/Library/Formula/zookeeper.rb +++ b/Library/Formula/zookeeper.rb @@ -12,19 +12,10 @@ class Zookeeper < Formula # https://issues.apache.org/jira/browse/ZOOKEEPER-2049 if MacOS.version == :yosemite patch :p0 do - url "https://issues.apache.org/jira/secure/attachment/12672517/ZOOKEEPER-2049.noprefix.branch-3.4.patch" - sha1 "001424dacb82209c12653b3fbcdc0847a41f4294" + url "https://issues.apache.org/jira/secure/attachment/12673210/ZOOKEEPER-2049.noprefix.branch-3.4.patch" + sha1 "ff0e971c028050ccebd8cc7caa348ab14716d664" end end - - # Everything in this block can go back to being head-only after next stable release; - # They are needed in stable presently because the Yosemite patch modifies configure. - if MacOS.version == :yosemite - depends_on "cppunit" => :build - depends_on "libtool" => :build - depends_on "autoconf" => :build - depends_on "automake" => :build - end end bottle do @@ -40,8 +31,8 @@ class Zookeeper < Formula # https://issues.apache.org/jira/browse/ZOOKEEPER-2049 if MacOS.version == :yosemite patch :p0 do - url "https://issues.apache.org/jira/secure/attachment/12672519/ZOOKEEPER-2049.noprefix.trunk.patch" - sha1 "009e7703431a3b81043b57a6ef19885fbc15221f" + url "https://issues.apache.org/jira/secure/attachment/12673212/ZOOKEEPER-2049.noprefix.trunk.patch" + sha1 "79ed0793e4693c9bbb83aad70582b55012f19eac" end end @@ -96,9 +87,6 @@ class Zookeeper < Formula end cd "src/c" do - # Remove the autotools from this block after next stable release. - system "aclocal" if MacOS.version == :yosemite - system "autoreconf", "-fvi" if MacOS.version == :yosemite system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", "--without-cppunit" |