homebrew-core/Formula/subversion.rb
Dominyk Tiller ccb889cd34 subversion : fix --perl bindings.
Patch suggested by @pwagland that should finally fix the --perl binding mv issue that causes the entire formula to error out if --perl build option is invoked. The issue & consequent patch will not affect anyone who doesn't build subversion with perl.

I've included a # explanation as to why the change has been made, as hopefully this patch can be replaced either by a subversion fix or a better Ruby-invoked fix in time. Although this could work as a permanent fix, the hope is that it's a temporary workaround until something cleaner is worked out.

See the following issues for more detail:

[1](https://github.com/Homebrew/homebrew/issues/30370)
[2](https://github.com/Homebrew/homebrew/issues/30224)

Closes Homebrew/homebrew#30500.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
2014-06-30 08:00:03 +01:00

275 lines
8.9 KiB
Ruby

require 'formula'
class Subversion < Formula
homepage 'https://subversion.apache.org/'
url 'http://www.apache.org/dyn/closer.cgi?path=subversion/subversion-1.8.9.tar.bz2'
mirror 'http://archive.apache.org/dist/subversion/subversion-1.8.9.tar.bz2'
sha1 '424ee12708f39a126efd905886666083dcc4eeaf'
bottle do
revision 2
sha1 "860453653114edfcf152bad3a7901719777a5f72" => :mavericks
sha1 "f9acba18f2d4547a24cd7e5a18eda47bf9f40925" => :mountain_lion
sha1 "1f632c42ec044abaaf373dd955aa100a8f879a81" => :lion
end
option :universal
option 'java', 'Build Java bindings'
option 'perl', 'Build Perl bindings'
option 'ruby', 'Build Ruby bindings'
resource 'serf' do
url 'https://serf.googlecode.com/svn/src_releases/serf-1.3.6.tar.bz2', :using => :curl
sha1 '409a153583b3e370a130e3fb1623ac98f5af9975'
end
depends_on "pkg-config" => :build
depends_on "autoconf" => :build
depends_on "automake" => :build
depends_on "libtool" => :build
# Always build against Homebrew versions instead of system versions for consistency.
depends_on 'sqlite'
depends_on :python => :optional
# Bindings require swig
depends_on 'swig' if build.include? 'perl' or build.with? 'python' or build.include? 'ruby'
# For Serf
depends_on 'scons' => :build
depends_on 'openssl'
# If building bindings, allow non-system interpreters
env :userpaths if build.include? 'perl' or build.include? 'ruby'
# 1. Prevent '-arch ppc' from being pulled in from Perl's $Config{ccflags}
# 2. Fix #23993 by stripping flags swig can't handle from SWIG_CPPFLAGS
patch :p0, :DATA
# When building Perl or Ruby bindings, need to use a compiler that
# recognizes GCC-style switches, since that's what the system languages
# were compiled against.
fails_with :clang do
build 318
cause "core.c:1: error: bad value (native) for -march= switch"
end if build.include? 'perl' or build.include? 'ruby'
def install
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}
CFLAGS=#{ENV.cflags} LINKFLAGS=#{ENV.ldflags}
OPENSSL=#{Formula["openssl"].opt_prefix}]
scons *args
scons "install"
end
if build.include? 'unicode-path'
raise Homebrew::InstallationError.new(self, <<-EOS.undent
The --unicode-path patch is not supported on Subversion 1.8.
Upgrading from a 1.7 version built with this patch is not supported.
You should stay on 1.7, install 1.7 from homebrew-versions, or
brew rm subversion && brew install subversion
to build a new version of 1.8 without this patch.
EOS
)
end
if build.include? '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 "To use Java bindings with various Java IDEs, you might need a universal build:"
puts " brew install subversion --universal --java"
end
if ENV["JAVA_HOME"]
opoo "JAVA_HOME is set. Try unsetting it if JNI headers cannot be found."
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)
args = ["--disable-debug",
"--prefix=#{prefix}",
"--with-apr=#{which("apr-1-config").dirname}",
"--with-zlib=/usr",
"--with-sqlite=#{Formula["sqlite"].opt_prefix}",
"--with-serf=#{serf_prefix}",
"--disable-mod-activation",
"--disable-nls",
"--without-apache-libexecdir",
"--without-berkeley-db"]
args << "--enable-javahl" << "--without-jikes" if build.include? 'java'
if build.include? 'ruby'
args << "--with-ruby-sitedir=#{lib}/ruby"
# Peg to system Ruby
args << "RUBY=/usr/bin/ruby"
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
inreplace 'Makefile.in',
'toolsdir = @bindir@/svn-tools',
'toolsdir = @libexecdir@/svn-tools'
# Suggestion by upstream. http://svn.haxx.se/users/archive-2013-09/0188.shtml
system "./autogen.sh"
system "./configure", *args
system "make"
system "make install"
bash_completion.install 'tools/client-side/bash_completion' => 'subversion'
system "make tools"
system "make install-tools"
if build.with? 'python'
system "make swig-py"
system "make install-swig-py"
end
if build.include? 'perl'
# 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
arches = "-arch #{Hardware::CPU.arch_32_bit}"
else
arches = "-arch #{Hardware::CPU.arch_64_bit}"
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}'"
end
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}"
end
system "make swig-pl"
system "make", "install-swig-pl", "DESTDIR=#{prefix}"
# Some of the libraries get installed into the wrong place, they end up having the
# prefix in the directory name twice.
# There's an ongoing issue with Ruby's mv placing files in the wrong directory and erroring out.
# The below addition should resolve the issue for now. See https://github.com/Homebrew/homebrew/issues/30370
lib.install Dir["#{prefix}/#{lib}/*"]
end
if build.include? 'java'
system "make javahl"
system "make install-javahl"
end
if build.include? 'ruby'
# Peg to system Ruby
system "make swig-rb EXTRA_SWIG_LDFLAGS=-L/usr/lib"
system "make install-swig-rb"
end
end
test do
system "#{bin}/svnadmin", 'create', 'test'
system "#{bin}/svnadmin", 'verify', 'test'
end
def caveats
s = <<-EOS.undent
svntools have been installed to:
#{opt_libexec}
EOS
if build.include? 'perl'
s += <<-EOS.undent
The perl bindings are located in various subdirectories of:
#{prefix}/Library/Perl
EOS
end
if build.include? 'ruby'
s += <<-EOS.undent
You may need to add the Ruby bindings to your RUBYLIB from:
#{HOMEBREW_PREFIX}/lib/ruby
EOS
end
if build.include? 'java'
s += <<-EOS.undent
You may need to link the Java bindings into the Java Extensions folder:
sudo mkdir -p /Library/Java/Extensions
sudo ln -s #{HOMEBREW_PREFIX}/lib/libsvnjavahl-1.dylib /Library/Java/Extensions/libsvnjavahl-1.dylib
EOS
end
return s.empty? ? nil : s
end
end
__END__
Patch 1
--- subversion/bindings/swig/perl/native/Makefile.PL.in~ 2013-06-20 18:58:55.000000000 +0200
+++ subversion/bindings/swig/perl/native/Makefile.PL.in 2013-06-20 19:00:49.000000000 +0200
@@ -69,10 +69,15 @@
chomp $apr_shlib_path_var;
+my $config_ccflags = $Config{ccflags};
+# remove any -arch arguments, since those
+# we want will already be in $cflags
+$config_ccflags =~ s/-arch\s+\S+//g;
+
my %config = (
ABSTRACT => 'Perl bindings for Subversion',
DEFINE => $cppflags,
- CCFLAGS => join(' ', $cflags, $Config{ccflags}),
+ CCFLAGS => join(' ', $cflags, $config_ccflags),
INC => join(' ', $includes, $cppflags,
" -I$swig_srcdir/perl/libsvn_swig_perl",
" -I$svnlib_srcdir/include",
Patch 2
diff -u configure.ac configure.ac
--- configure.ac (working copy)
+++ configure.ac (working copy)
@@ -1446,6 +1446,10 @@
# Need to strip '-no-cpp-precomp' from CPPFLAGS for SWIG as well.
SWIG_CPPFLAGS="$CPPFLAGS"
SVN_STRIP_FLAG(SWIG_CPPFLAGS, [-no-cpp-precomp ])
+# Swig don't understand "-F" and "-isystem" flags added by Homebrew,
+# so filter them out.
+SVN_STRIP_FLAG(SWIG_CPPFLAGS, [-F\/[[^ ]]* ])
+SVN_STRIP_FLAG(SWIG_CPPFLAGS, [-isystem\/[[^ ]]* ])
AC_SUBST([SWIG_CPPFLAGS])
dnl Since this is used only on Unix-y systems, define the path separator as '/'