Skip to content

Commit

Permalink
Subversion: always build against system ruby
Browse files Browse the repository at this point in the history
  • Loading branch information
adamv committed Feb 4, 2013
1 parent ae51848 commit ba57da0
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions Formula/subversion.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ def apr_bin
end

def install
# We had weird issues with "make" apparently hanging on first run: https://github.com/mxcl/homebrew/issues/13226
# We had weird issues with "make" apparently hanging on first run:
# https://github.com/mxcl/homebrew/issues/13226
ENV.deparallelize

if build_java?
Expand All @@ -85,15 +86,20 @@ def install
"--with-ssl",
"--with-zlib=/usr",
"--with-sqlite=#{Formula.factory('sqlite').opt_prefix}",
"--with-serf=#{HOMEBREW_PREFIX}",
"--with-serf=#{Formula.factory('serf').opt_prefix}",
# use our neon, not OS X's
"--disable-neon-version-check",
"--disable-mod-activation",
"--without-apache-libexecdir",
"--without-berkeley-db"]

args << "--enable-javahl" << "--without-jikes" if build_java?
args << "--with-ruby-sitedir=#{lib}/ruby" if build_ruby?

if build_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
Expand Down Expand Up @@ -138,7 +144,8 @@ def install
end

if build_ruby?
system "make swig-rb"
# Peg to system Ruby
system "make swig-rb EXTRA_SWIG_LDFLAGS=-L/usr/lib"
system "make install-swig-rb"
end
end
Expand Down

0 comments on commit ba57da0

Please sign in to comment.