Commit 50dc0c99 authored by Christian Höltje's avatar Christian Höltje
Browse files

Use Homebrew libyaml if it is available 

This checks for Homebrew's yaml to see if it
is available and that `--with-libyaml-dir` hasn't
been specified.

Related issue: #379
parent 86daa429

bin/ruby-build

+14 −0
Original line number Diff line number Diff line
@@ -606,6 +606,20 @@ verify_gcc() { 
  echo "$gcc"

}



needs_yaml() {

  [[ "$RUBY_CONFIGURE_OPTS" != *--with-libyaml-dir=* ]] &&

  ! use_homebrew_yaml

}



use_homebrew_yaml() {

  local libdir="$(brew --prefix libyaml 2>/dev/null || true)"

  if [ -d "$libdir" ]; then

    package_option ruby configure --with-libyaml-dir="$libdir"

  else

    return 1

  fi

}



has_broken_mac_openssl() {

  [ "$(uname -s)" = "Darwin" ] &&

  [[ "$(openssl version 2>/dev/null || true)" = "OpenSSL 0.9.8"?* ]] &&

share/ruby-build/1.9.1-p378

+1 −1
Original line number Diff line number Diff line 
require_gcc

install_package "yaml-0.1.4" "http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz#36c852831d02cf90508c29852361d01b"

install_package "yaml-0.1.4" "http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz#36c852831d02cf90508c29852361d01b" --if needs_yaml

install_package "ruby-1.9.1-p378" "http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-p378.tar.gz#9fc5941bda150ac0a33b299e1e53654c"

install_package "rubygems-1.3.7" "http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz#e85cfadd025ff6ab689375adbf344bbe" ruby

share/ruby-build/1.9.1-p430

+1 −1
Original line number Diff line number Diff line 
require_gcc

install_package "yaml-0.1.4" "http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz#36c852831d02cf90508c29852361d01b"

install_package "yaml-0.1.4" "http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz#36c852831d02cf90508c29852361d01b" --if needs_yaml

install_package "ruby-1.9.1-p430" "http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-p430.tar.gz#093d17e911b1f7306de95422ec332826"

install_package "rubygems-1.3.7" "http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz#e85cfadd025ff6ab689375adbf344bbe" ruby

share/ruby-build/1.9.2-p0

+1 −1
Original line number Diff line number Diff line 
require_gcc

install_package "yaml-0.1.4" "http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz#36c852831d02cf90508c29852361d01b"

install_package "yaml-0.1.4" "http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz#36c852831d02cf90508c29852361d01b" --if needs_yaml

install_package "ruby-1.9.2-p0" "http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p0.tar.gz#755aba44607c580fddc25e7c89260460"

install_package "rubygems-1.8.23" "http://production.cf.rubygems.org/rubygems/rubygems-1.8.23.tgz#178b0ebae78dbb46963c51ad29bb6bd9" ruby

share/ruby-build/1.9.2-p180

+1 −1
Original line number Diff line number Diff line 
require_gcc

install_package "yaml-0.1.4" "http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz#36c852831d02cf90508c29852361d01b"

install_package "yaml-0.1.4" "http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz#36c852831d02cf90508c29852361d01b" --if needs_yaml

install_package "ruby-1.9.2-p180" "http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p180.tar.gz#0d6953820c9918820dd916e79f4bfde8"

install_package "rubygems-1.8.23" "http://production.cf.rubygems.org/rubygems/rubygems-1.8.23.tgz#178b0ebae78dbb46963c51ad29bb6bd9" ruby