diff options
| author | Jack Nagel | 2015-03-09 20:54:39 -0400 |
|---|---|---|
| committer | Jack Nagel | 2015-03-09 20:54:41 -0400 |
| commit | f1194c730efa6540ea1609f99c6c9f528e3d2a4c (patch) | |
| tree | 8c28dd7c45bbf47ea897bab3b760785e885c265d | |
| parent | c8f53d4720a918b27d14388a3483905fdbb3ecc6 (diff) | |
| download | homebrew-f1194c730efa6540ea1609f99c6c9f528e3d2a4c.tar.bz2 | |
avro-c: remove xz conflict
avro-c/acro-cpp depends on cmake, which depends on xz, so if this
conflict still causes problems it needs to be fixed in a different way.
It seems to work fine locally.
Fixes #37546.
| -rw-r--r-- | Library/Formula/avro-c.rb | 6 | ||||
| -rw-r--r-- | Library/Formula/avro-cpp.rb | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/Library/Formula/avro-c.rb b/Library/Formula/avro-c.rb index 563f28bd5..169384f58 100644 --- a/Library/Formula/avro-c.rb +++ b/Library/Formula/avro-c.rb @@ -1,13 +1,9 @@ -require "formula" - class AvroC < Formula homepage "http://avro.apache.org/" url "http://www.apache.org/dyn/closer.cgi?path=avro/avro-1.7.7/c/avro-c-1.7.7.tar.gz" sha1 "cbb698682d662c5e0abec023dcd37ce1f3db80d4" - # probably should be an optional dep - conflicts_with "xz" - + depends_on "pkg-config" => :build depends_on "cmake" => :build def install diff --git a/Library/Formula/avro-cpp.rb b/Library/Formula/avro-cpp.rb index b78a1958e..46edc94f0 100644 --- a/Library/Formula/avro-cpp.rb +++ b/Library/Formula/avro-cpp.rb @@ -1,10 +1,9 @@ -require "formula" - class AvroCpp < Formula homepage "http://avro.apache.org/" url "http://www.apache.org/dyn/closer.cgi?path=avro/avro-1.7.7/cpp/avro-cpp-1.7.7.tar.gz" sha1 "2fdc16bfee5786053846341d89d11160df8d57d4" + depends_on "pkg-config" => :build depends_on "cmake" => :build depends_on "boost" |