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

subversion@1.8: remove universal

Browse source
This commit is contained in:
FX Coudert 2017-05-07 11:21:11 +02:00
parent c929abc78f
commit 35e48fe847
1 changed files with 3 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Formula/subversion@1.8.rb
View file

@ -102,19 +102,8 @@ class SubversionAT18 < Formula
EOS
end
if build.with? "java"
# 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
# Java support doesn't build correctly in parallel: https://github.com/Homebrew/homebrew/issues/20415
ENV.deparallelize if build.with? "java"
# Use existing system zlib
# Use dep-provided other libraries
@ -147,13 +136,6 @@ class SubversionAT18 < 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
@ -179,14 +161,6 @@ class SubversionAT18 < Formula
if build.with? "perl"
# In theory SWIG can be built in parallel, in practice...
ENV.deparallelize
# Remove hard-coded ppc target, add appropriate ones
arches = begin
if build.universal?
Hardware::CPU.universal_archs.as_arch_flags
else
"-arch #{MacOS.preferred_arch}"
end
end
perl_core = Pathname.new(`perl -MConfig -e 'print $Config{archlib}'`)+"CORE"
unless perl_core.exist?
onoe "perl CORE directory does not exist in '#{perl_core}'"
@ -194,7 +168,7 @@ class SubversionAT18 < Formula
inreplace "Makefile" do |s|
s.change_make_var! "SWIG_PL_INCLUDES",
"$(SWIG_INCLUDES) #{arches} -g -pipe -fno-common -DPERL_DARWIN -fno-strict-aliasing -I/usr/local/include -I#{perl_core}"
"$(SWIG_INCLUDES) -arch #{MacOS.preferred_arch} -g -pipe -fno-common -DPERL_DARWIN -fno-strict-aliasing -I/usr/local/include -I#{perl_core}"
end
system "make", "swig-pl"
system "make", "install-swig-pl", "DESTDIR=#{prefix}"