wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

subversion: remove universal python fail

Browse source 
Remove --universal requirement when using --with-python and a universal Python.
This commit is contained in:
Daniel Lee Harple 2015-08-30 18:37:25 -04:00 committed by Mike McQuaid
parent 1c13fa38a9
commit 0c919af69f
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Formula/subversion.rb
View file

@ -72,19 +72,6 @@ class Subversion < Formula
end
def install
# OS X's Python is built universally and can't link with Homebrew's deps
# unless Homebrew's deps are universal as well.
# https://github.com/Homebrew/homebrew-versions/issues/777
# https://github.com/Homebrew/homebrew/issues/34119
if build.with?("python") && (which "python").universal?
unless build.universal?
raise <<-EOS.undent
You must build subversion --universal unless Homebrew's
Python is installed, otherwise the build will fail.
EOS
end
end
serf_prefix = libexec+"serf"
resource("serf").stage do
@ -168,6 +155,13 @@ 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