subversion: universal is now passed to deps automatically
parent
e6cbf0293f
commit
0f0f70e259
|
@ -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?
|
||||
|
||||
|
|
Loading…
Reference in New Issue