diff --git a/Formula/subversion.rb b/Formula/subversion.rb index 77421ebbfc..3024ff3717 100644 --- a/Formula/subversion.rb +++ b/Formula/subversion.rb @@ -16,7 +16,6 @@ class Subversion < Formula deprecated_option "perl" => "with-perl" deprecated_option "ruby" => "with-ruby" - option :universal option "with-java", "Build Java bindings" option "with-perl", "Build Perl bindings" option "with-ruby", "Build Ruby bindings" @@ -71,14 +70,6 @@ class Subversion < Formula serf_prefix = libexec/"serf" resource("serf").stage do - # SConstruct merges in gssapi linkflags using scons's MergeFlags, - # but that discards duplicate values - including the duplicate - # values we want, like multiple -arch values for a universal build. - # Passing 0 as the `unique` kwarg turns this behaviour off. - inreplace "SConstruct", "unique=1", "unique=0" - - ENV.universal_binary if build.universal? - # scons ignores our compiler and flags unless explicitly passed args = %W[ PREFIX=#{serf_prefix} GSSAPI=/usr CC=#{ENV.cc} @@ -95,18 +86,8 @@ class Subversion < Formula # Java support doesn't build correctly in parallel: # https://github.com/Homebrew/homebrew/issues/20415 ENV.deparallelize - - unless build.universal? - opoo "A non-Universal Java build was requested." - puts <<-EOS.undent - To use Java bindings with various Java IDEs, you might need a universal build: - `brew install subversion --universal --java` - EOS - end end - ENV.universal_binary if build.universal? - # Use existing system zlib # Use dep-provided other libraries # Don't mess with Apache modules (since we're not sudo) @@ -135,13 +116,6 @@ class Subversion < Formula args << "RUBY=/usr/bin/ruby" end - # If Python is built universally, then extensions built with that Python - # are too. This default behaviour is not desired when building an extension - # for a single architecture. - if build.with?("python") && (which "python").universal? && !build.universal? - ENV["ARCHFLAGS"] = "-arch #{MacOS.preferred_arch}" - end - # The system Python is built with llvm-gcc, so we override this # variable to prevent failures due to incompatible CFLAGS ENV["ac_cv_python_compile"] = ENV.cc @@ -168,9 +142,7 @@ class Subversion < Formula # In theory SWIG can be built in parallel, in practice... ENV.deparallelize # Remove hard-coded ppc target, add appropriate ones - if build.universal? - arches = Hardware::CPU.universal_archs.as_arch_flags - elsif MacOS.version <= :leopard + if MacOS.version <= :leopard arches = "-arch #{Hardware::CPU.arch_32_bit}" else arches = "-arch #{Hardware::CPU.arch_64_bit}"