Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

subversion: update requirements

* serf needs to be universal when building universal
* make universal requirements fatal
  • Loading branch information...
commit 19c537f12f5736e3a48322d6ff12545241fd4179 1 parent d82fbcd
@adamv adamv authored
Showing with 30 additions and 2 deletions.
  1. +30 −2 Library/Formula/subversion.rb
View
32 Library/Formula/subversion.rb
@@ -9,9 +9,14 @@ def with_unicode_path?; ARGV.include? "--unicode-path"; end
class UniversalNeon < Requirement
def message; <<-EOS.undent
A universal build was requested, but neon was already built for a single arch.
- You may need to `brew rm neon` first.
+ You will need to `brew rm neon` first.
EOS
end
+
+ def fatal?
+ true
+ end
+
def satisfied?
f = Formula.factory('neon')
!f.installed? || archs_for_command(f.lib+'libneon.dylib').universal?
@@ -21,15 +26,37 @@ def satisfied?
class UniversalSqlite < Requirement
def message; <<-EOS.undent
A universal build was requested, but sqlite was already built for a single arch.
- You may need to `brew rm sqlite` first.
+ You will need to `brew rm sqlite` first.
EOS
end
+
+ def fatal?
+ true
+ end
+
def satisfied?
f = Formula.factory('sqlite')
!f.installed? || archs_for_command(f.lib+'libsqlite3.dylib').universal?
end
end
+class UniversalSerf < Requirement
+ 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 fatal?
+ true
+ 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.5.tar.bz2'
@@ -47,6 +74,7 @@ class Subversion < Formula
if ARGV.build_universal?
depends_on UniversalNeon.new
depends_on UniversalSqlite.new
+ depends_on UniversalSerf.new
end
def options
Please sign in to comment.
Something went wrong with that request. Please try again.