From c97e574578960e2727cf925f1a15632f46edead6 Mon Sep 17 00:00:00 2001 From: Chris Gunther Date: Wed, 21 Sep 2011 21:48:29 -0400 Subject: [PATCH 1/2] Support REE 1.8.7-2010.02 --- share/ruby-build/ree-1.8.7-2010.02 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 share/ruby-build/ree-1.8.7-2010.02 diff --git a/share/ruby-build/ree-1.8.7-2010.02 b/share/ruby-build/ree-1.8.7-2010.02 new file mode 100644 index 00000000..ad6221e2 --- /dev/null +++ b/share/ruby-build/ree-1.8.7-2010.02 @@ -0,0 +1,16 @@ +build_package_ree_installer() { + local options="" + if [[ "Darwin" = "$(uname)" ]]; then + options="--no-tcmalloc" + fi + + # Work around install_useful_libraries crash with --dont-install-useful-gems + mkdir -p "$PREFIX_PATH/lib/ruby/gems/1.8/gems" + + { ./installer --auto "$PREFIX_PATH" --dont-install-useful-gems $options + } >&4 2>&1 +} + +use_gcc42_on_lion +install_package "ruby-enterprise-1.8.7-2010.02" "http://files.rubyforge.vm.bytemark.co.uk/emm-ruby/ruby-enterprise-1.8.7-2010.02.tar.gz" ree_installer +install_package "rubygems-1.6.2" "http://production.cf.rubygems.org/rubygems/rubygems-1.6.2.tgz" ruby From 9979cc3998575f3d770744e2b5334da773fb1760 Mon Sep 17 00:00:00 2001 From: Chris Gunther Date: Thu, 22 Sep 2011 11:49:16 -0400 Subject: [PATCH 2/2] move build_package_ree_installer function to ruby-build script --- bin/ruby-build | 13 +++++++++++++ share/ruby-build/ree-1.8.7-2010.02 | 13 ------------- share/ruby-build/ree-1.8.7-2011.03 | 10 ---------- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/bin/ruby-build b/bin/ruby-build index 07378c5f..f8fc0c4b 100755 --- a/bin/ruby-build +++ b/bin/ruby-build @@ -126,6 +126,19 @@ build_package_ruby() { } >&4 2>&1 } +build_package_ree_installer() { + local options="" + if [[ "Darwin" = "$(uname)" ]]; then + options="--no-tcmalloc" + fi + + # Work around install_useful_libraries crash with --dont-install-useful-gems + mkdir -p "$PREFIX_PATH/lib/ruby/gems/1.8/gems" + + { ./installer --auto "$PREFIX_PATH" --dont-install-useful-gems $options + } >&4 2>&1 +} + build_package_rbx() { local package_name="$1" diff --git a/share/ruby-build/ree-1.8.7-2010.02 b/share/ruby-build/ree-1.8.7-2010.02 index ad6221e2..744ea5bb 100644 --- a/share/ruby-build/ree-1.8.7-2010.02 +++ b/share/ruby-build/ree-1.8.7-2010.02 @@ -1,16 +1,3 @@ -build_package_ree_installer() { - local options="" - if [[ "Darwin" = "$(uname)" ]]; then - options="--no-tcmalloc" - fi - - # Work around install_useful_libraries crash with --dont-install-useful-gems - mkdir -p "$PREFIX_PATH/lib/ruby/gems/1.8/gems" - - { ./installer --auto "$PREFIX_PATH" --dont-install-useful-gems $options - } >&4 2>&1 -} - use_gcc42_on_lion install_package "ruby-enterprise-1.8.7-2010.02" "http://files.rubyforge.vm.bytemark.co.uk/emm-ruby/ruby-enterprise-1.8.7-2010.02.tar.gz" ree_installer install_package "rubygems-1.6.2" "http://production.cf.rubygems.org/rubygems/rubygems-1.6.2.tgz" ruby diff --git a/share/ruby-build/ree-1.8.7-2011.03 b/share/ruby-build/ree-1.8.7-2011.03 index 9fe65f60..8d60c8f7 100644 --- a/share/ruby-build/ree-1.8.7-2011.03 +++ b/share/ruby-build/ree-1.8.7-2011.03 @@ -1,13 +1,3 @@ -build_package_ree_installer() { - local options="" - if [[ "Darwin" = "$(uname)" ]]; then - options="--no-tcmalloc" - fi - - { ./installer --auto "$PREFIX_PATH" --dont-install-useful-gems $options - } >&4 2>&1 -} - use_gcc42_on_lion install_package "ruby-enterprise-1.8.7-2011.03" "http://rubyenterpriseedition.googlecode.com/files/ruby-enterprise-1.8.7-2011.03.tar.gz" ree_installer install_package "rubygems-1.6.2" "http://production.cf.rubygems.org/rubygems/rubygems-1.6.2.tgz" ruby