Commit 87d7e109 authored by Mislav Marohnić's avatar Mislav Marohnić
Browse files

Merge branch 'rbx' 

See https://github.com/rubinius/rubinius/issues/3169
parents b396ad7c b3512f49

bin/ruby-build

+16 −3
Original line number Diff line number Diff line
@@ -514,8 +514,12 @@ build_package_ree_installer() { 
build_package_rbx() {

  local package_name="$1"



  { bundle --path=vendor/bundle

    RUBYOPT="-rubygems $RUBYOPT" ./configure --prefix="$PREFIX_PATH" $RUBY_CONFIGURE_OPTS

  { [ ! -e "Gemfile" ] || bundle --path=vendor/bundle

    if [ -n "$RUBY_BUILD_CACHE_PATH" ]; then

      mkdir -p vendor

      ln -s "$RUBY_BUILD_CACHE_PATH" vendor/prebuilt

    fi

    RUBYOPT="-rubygems $RUBYOPT" ./configure --prefix="$PREFIX_PATH" $RUBY_CONFIGURE_OPTS "${RUBY_CONFIGURE_OPTS_ARRAY[@]}"

    rake install

    fix_rbx_gem_binstubs "$PREFIX_PATH"

    fix_rbx_irb "$PREFIX_PATH"
@@ -640,7 +644,7 @@ fix_rbx_gem_binstubs() { 
  local bindir="${prefix}/bin"

  local file binstub

  # Symlink Rubinius' `gems/bin/` into `bin/`

  if [ -d "$gemdir" ]; then

  if [ -d "$gemdir" ] && [ ! -L "$gemdir" ]; then

    for file in "$gemdir"/*; do

      binstub="${bindir}/${file##*/}"

      rm -f "$binstub"
@@ -766,6 +770,15 @@ verify_gcc() { 
  echo "$gcc"

}



require_llvm() {

  local llvm_version="$1"

  if [ "$(uname -s)" = "Darwin" ] && [ "$(osx_version)" -ge 1010 ]; then

    if [[ "$RUBY_CONFIGURE_OPTS" != *--llvm-* ]]; then

      package_option ruby configure --prebuilt-name="llvm-3.2-x86_64-apple-darwin13.tar.bz2"

    fi

  fi

}



needs_yaml() {

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

  ! use_homebrew_yaml

share/ruby-build/rbx-1.2.4

+1 −0
Original line number Diff line number Diff line 
require_llvm 2.8

install_package "rubinius-1.2.4" "http://asset.rubini.us/rubinius-1.2.4-20110705.tar.gz#d474fb6f50292bff5211aaa80b1cead1fb3ed5c7c49223c51fddb8ffc5c3f23d" rbx

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

share/ruby-build/rbx-2.0.0

+2 −1
Original line number Diff line number Diff line 
install_package "yaml-0.1.6" "http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz#7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749" --if needs_yaml

require_llvm 3.2

install_package "yaml-0.1.6" "http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz#7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749"

install_package "rubinius-2.0.0" "http://releases.rubini.us/rubinius-2.0.0.tar.bz2#df039c7c52e9e42a2f3e0d0b67bf2c9b255769d1f8c3bac2333469ca8c0e04c4" rbx

share/ruby-build/rbx-2.0.0-dev

+2 −1
Original line number Diff line number Diff line 
install_package "yaml-0.1.6" "http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz#7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749" --if needs_yaml

require_llvm 3.4.2

install_package "yaml-0.1.6" "http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz#7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749"

install_git "rubinius-2.0.0-dev" "https://github.com/rubinius/rubinius.git" "master" rbx

share/ruby-build/rbx-2.0.0-rc1

+2 −1
Original line number Diff line number Diff line 
install_package "yaml-0.1.6" "http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz#7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749" --if needs_yaml

require_llvm 3.2

install_package "yaml-0.1.6" "http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz#7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749"

install_package "rubinius-release-2.0.0-rc1" "https://nodeload.github.com/rubinius/rubinius/tar.gz/release-2.0.0-rc1#ac1f5a657682904ec227fe5e2410dbdfbfa0abf86cdee722c81fa6b3609c8ab3" rbx