diff options
| author | Jack Nagel | 2013-01-26 11:57:17 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-01-26 12:28:52 -0600 |
| commit | 8899d9075eacd9adb20560303cd421f8e72f7d72 (patch) | |
| tree | 507f958214f4bfb025848fa96c4aa3a4aabec26c /Library/Formula | |
| parent | c69d7ffc1447ac1bf79bba22204fa7160298ce29 (diff) | |
| download | homebrew-8899d9075eacd9adb20560303cd421f8e72f7d72.tar.bz2 | |
subversion: universal is now passed to deps automatically
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/subversion.rb | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/Library/Formula/subversion.rb b/Library/Formula/subversion.rb index 8d9514da8..cb3168928 100644 --- a/Library/Formula/subversion.rb +++ b/Library/Formula/subversion.rb @@ -6,51 +6,6 @@ def build_python?; build.include? "python"; end def build_ruby?; build.include? "ruby"; end def with_unicode_path?; build.include? "unicode-path"; end -class UniversalNeon < Requirement - fatal true - - def message; <<-EOS.undent - A universal build was requested, but neon was already built for a single arch. - You will need to `brew rm neon` first. - EOS - end - - def satisfied? - f = Formula.factory('neon') - !f.installed? || archs_for_command(f.lib+'libneon.dylib').universal? - end -end - -class UniversalSqlite < Requirement - fatal true - - def message; <<-EOS.undent - A universal build was requested, but sqlite was already built for a single arch. - You will need to `brew rm sqlite` first. - EOS - end - - def satisfied? - f = Formula.factory('sqlite') - !f.installed? || archs_for_command(f.lib+'libsqlite3.dylib').universal? - end -end - -class UniversalSerf < Requirement - fatal true - - def message; <<-EOS.undent - A universal build was requested, but serf was already built for a single arch. - You will need to `brew rm serf` first. - EOS - end - - def satisfied? - f = Formula.factory('serf') - !f.installed? || archs_for_command(f.lib+'libserf-1.0.0.0.dylib').universal? - end -end - class Subversion < Formula homepage 'http://subversion.apache.org/' url 'http://www.apache.org/dyn/closer.cgi?path=subversion/subversion-1.7.8.tar.bz2' @@ -70,12 +25,6 @@ class Subversion < Formula depends_on 'sqlite' depends_on 'serf' - if build.universal? - depends_on UniversalNeon.new - depends_on UniversalSqlite.new - depends_on UniversalSerf.new - end - # Building Ruby bindings requires libtool depends_on :libtool if build_ruby? |