class Subversion < Formula desc "Version control system designed to be a better CVS" homepage "https://subversion.apache.org/" url "https://www.apache.org/dyn/closer.cgi?path=subversion/subversion-1.9.4.tar.bz2" mirror "https://archive.apache.org/dist/subversion/subversion-1.9.4.tar.bz2" sha256 "1267f9e2ab983f260623bee841e6c9cc458bf4bf776238ed5f100983f79e9299" bottle do sha256 "90181167e17df6fae630aff2523dc4aebded7fca1fb74bdd2ca1bd6f86287cc8" => :el_capitan sha256 "f54a431445d81b80c9e0b5b04a733f7242f004feb94105afe76fb40068f8e4c5" => :yosemite sha256 "a75716d92711bc92aaeda892cc2c4d47d4e718cd3c888948bd41587a2f022b00" => :mavericks end deprecated_option "java" => "with-java" 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" option "with-gpg-agent", "Build with support for GPG Agent" depends_on "pkg-config" => :build depends_on :apr => :build resource "serf" do url "https://archive.apache.org/dist/serf/serf-1.3.8.tar.bz2" sha256 "e0500be065dbbce490449837bb2ab624e46d64fc0b090474d9acaa87c82b2590" end # 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.with?("perl") || build.with?("python") || build.with?("ruby") # For Serf depends_on "scons" => :build depends_on "openssl" # Other optional dependencies depends_on "gpg-agent" => :optional depends_on :java => :optional # Fix #23993 by stripping flags swig can't handle from SWIG_CPPFLAGS # Prevent "-arch ppc" from being pulled in from Perl's $Config{ccflags} # Prevent linking into a Python Framework patch :DATA if build.with?("perl") || build.with?("ruby") # If building bindings, allow non-system interpreters # Currently the serf -> scons dependency forces stdenv, so this isn't # strictly necessary env :userpaths # 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 end 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}] unless MacOS::CLT.installed? args << "APR=#{Formula["apr"].opt_prefix}" args << "APU=#{Formula["apr-util"].opt_prefix}" end scons(*args) scons "install" 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 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 = %W[ --disable-debug --prefix=#{prefix} --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.with? "java" args << "--without-gpg-agent" if build.without? "gpg-agent" if MacOS::CLT.installed? args << "--with-apr=/usr" args << "--with-apr-util=/usr" else args << "--with-apr=#{Formula["apr"].opt_prefix}" args << "--with-apr-util=#{Formula["apr-util"].opt_prefix}" args << "--with-apxs=no" end if build.with? "ruby" args << "--with-ruby-sitedir=#{lib}/ruby" # Peg to system Ruby 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 inreplace "Makefile.in", "toolsdir = @bindir@/svn-tools", "toolsdir = @libexecdir@/svn-tools" 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" (lib/"python2.7/site-packages").install_symlink Dir["#{lib}/svn-python/*"] end if build.with? "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" # Some of the libraries get installed into the wrong place, they end up having the # prefix in the directory name twice. lib.install Dir["#{prefix}/#{lib}/*"] end if build.with? "java" system "make", "javahl" system "make", "install-javahl" end if build.with? "ruby" # Peg to system Ruby system "make", "swig-rb", "EXTRA_SWIG_LDFLAGS=-L/usr/lib" system "make", "install-swig-rb" end end def caveats s = <<-EOS.undent svntools have been installed to: #{opt_libexec} EOS if build.with? "perl" s += <<-EOS.undent The perl bindings are located in various subdirectories of: #{prefix}/Library/Perl EOS end if build.with? "ruby" s += <<-EOS.undent You may need to add the Ruby bindings to your RUBYLIB from: #{HOMEBREW_PREFIX}/lib/ruby EOS end if build.with? "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 s end test do system "#{bin}/svnadmin", "create", "test" system "#{bin}/svnadmin", "verify", "test" end end __END__ diff --git a/configure b/configure index 445251b..6ff4332 100755 --- a/configure +++ b/configure @@ -25366,6 +25366,8 @@ fi SWIG_CPPFLAGS="$CPPFLAGS" SWIG_CPPFLAGS=`echo "$SWIG_CPPFLAGS" | $SED -e 's/-no-cpp-precomp //'` + SWIG_CPPFLAGS=`echo "$SWIG_CPPFLAGS" | $SED -e 's/-F\/[^ ]* //'` + SWIG_CPPFLAGS=`echo "$SWIG_CPPFLAGS" | $SED -e 's/-isystem\/[^ ]* //'` diff --git a/subversion/bindings/swig/perl/native/Makefile.PL.in b/subversion/bindings/swig/perl/native/Makefile.PL.in index a60430b..bd9b017 100644 --- a/subversion/bindings/swig/perl/native/Makefile.PL.in +++ b/subversion/bindings/swig/perl/native/Makefile.PL.in @@ -76,10 +76,13 @@ my $apr_ldflags = '@SVN_APR_LIBS@' chomp $apr_shlib_path_var; +my $config_ccflags = $Config{ccflags}; +$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", diff --git a/build/get-py-info.py b/build/get-py-info.py index 29a6c0a..dd1a5a8 100644 --- a/build/get-py-info.py +++ b/build/get-py-info.py @@ -83,7 +83,7 @@ def link_options(): options = sysconfig.get_config_var('LDSHARED').split() fwdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR') - if fwdir and fwdir != "no-framework": + if fwdir and fwdir != "no-framework" and sys.platform != 'darwin': # Setup the framework prefix fwprefix = sysconfig.get_config_var('PYTHONFRAMEWORKPREFIX')