Commit d13ae0ad authored by Mislav Marohnić's avatar Mislav Marohnić
Browse files

Enable compiling Ruby 1.8 on OS X 10.8+ without extra flags 

Because OS X Mountain Lion removed X Windows, compiling Ruby 1.8 would
fail unless the user installed XQuartz manually and passed:

    CPPFLAGS=-I/opt/X11/include rbenv install 1.8.7-p374

This auto-detects if `/opt/X11/include` is present on the system and
configures CPPFLAGS accordingly. However if XQuartz was never installed,
we simply configure Ruby using `--without-tk`.

Fixes #193 #207

References 35324692
parent 805051fb

bin/ruby-build

+14 −6
Original line number Diff line number Diff line
@@ -422,15 +422,11 @@ build_package_ruby() { 
}



build_package_ree_installer() {

  build_package_auto_tcltk



  local options=""

  if [[ "Darwin" = "$(uname)" ]]; then

    options="--no-tcmalloc"



    # Some versions of REE mistakenly detect Tk support

    # on OS X even though X11 is not installed.

    if [ ! -d "/usr/include/X11" ]; then

      options="$options -c --without-tk"

    fi

  fi



  local option
@@ -720,6 +716,18 @@ build_package_ldflags_dirs() { 
  done

}



build_package_auto_tcltk() {

  if [ "Darwin" = "$(uname -s)" ] && [ ! -d /usr/include/X11 ]; then

    if [ -d /opt/X11/include ]; then

      if [[ "$CPPFLAGS" != *-I/opt/X11/include* ]]; then

        export CPPFLAGS="-I/opt/X11/include $CPPFLAGS"

      fi

    else

      package_option ruby configure --without-tk

    fi

  fi

}



rake() {

  if [ -e "./Gemfile" ]; then

    bundle exec rake "$@"

share/ruby-build/1.8.6-p383

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

install_package "ruby-1.8.6-p383" "http://cache.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p383.tar.gz#4f49544d4a4d0d34e9d86c41e853db2e"

install_package "ruby-1.8.6-p383" "http://cache.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p383.tar.gz#4f49544d4a4d0d34e9d86c41e853db2e" auto_tcltk standard

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

share/ruby-build/1.8.6-p420

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

install_package "ruby-1.8.6-p420" "http://cache.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p420.tar.gz#ca1eee44f842e93b5098bc5a2bb9a40b"

install_package "ruby-1.8.6-p420" "http://cache.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p420.tar.gz#ca1eee44f842e93b5098bc5a2bb9a40b" auto_tcltk standard

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

share/ruby-build/1.8.7-p249

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

install_package "ruby-1.8.7-p249" "http://cache.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p249.tar.gz#d7db7763cffad279952eb7e9bbfc221c"

install_package "ruby-1.8.7-p249" "http://cache.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p249.tar.gz#d7db7763cffad279952eb7e9bbfc221c" auto_tcltk standard

install_package "rubygems-1.6.2" "http://production.cf.rubygems.org/rubygems/rubygems-1.6.2.tgz#0c95a9869914ba1a45bf71d3b8048420" ruby

share/ruby-build/1.8.7-p302

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

install_package "ruby-1.8.7-p302" "http://cache.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p302.tar.gz#f446550dfde0d8162a6ed8d5a38b3ac2"

install_package "ruby-1.8.7-p302" "http://cache.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p302.tar.gz#f446550dfde0d8162a6ed8d5a38b3ac2" auto_tcltk standard

install_package "rubygems-1.6.2" "http://production.cf.rubygems.org/rubygems/rubygems-1.6.2.tgz#0c95a9869914ba1a45bf71d3b8048420" ruby