From 59ed6cc6a22beee1c1538ad0b2ec38a4c6cbeaf7 Mon Sep 17 00:00:00 2001 From: Jay Lawrence Date: Sun, 17 Mar 2019 12:53:21 -0400 Subject: [PATCH 1/3] Parameterize building of the jruby-launcher gem --- bin/ruby-build | 6 +++++- share/ruby-build/jruby-1.6.8 | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/ruby-build b/bin/ruby-build index 6518cdbee0..d6ea23b433 100755 --- a/bin/ruby-build +++ b/bin/ruby-build @@ -727,11 +727,15 @@ build_package_jruby() { cd "${PREFIX_PATH}/bin" ln -fs jruby ruby chmod +x ruby - install_jruby_launcher + [ -z "${JRUBY_LAUNCHER_DISABLED}" ] && install_jruby_launcher remove_windows_files fix_jruby_shebangs } +build_package_disable_launcher() { + JRUBY_LAUNCHER_DISABLED=true +} + install_jruby_launcher() { cd "${PREFIX_PATH}/bin" { ./ruby gem install jruby-launcher diff --git a/share/ruby-build/jruby-1.6.8 b/share/ruby-build/jruby-1.6.8 index 258f3729d7..c764a9926a 100644 --- a/share/ruby-build/jruby-1.6.8 +++ b/share/ruby-build/jruby-1.6.8 @@ -1 +1 @@ -install_package "jruby-1.6.8" "https://s3.amazonaws.com/jruby-org/downloads/1.6.8/jruby-bin-1.6.8.tar.gz#e3b05f9cf0ba9b02e6cba75d5b62e2abf8ac7a4483c3713dc4eb83e3b8b162d4" warn_eol jruby +install_package "jruby-1.6.8" "https://s3.amazonaws.com/jruby-org/downloads/1.6.8/jruby-bin-1.6.8.tar.gz#e3b05f9cf0ba9b02e6cba75d5b62e2abf8ac7a4483c3713dc4eb83e3b8b162d4" warn_eol disable_launcher jruby From 811e071f6dc2c55e807a5e9df470c943979143d3 Mon Sep 17 00:00:00 2001 From: Jay Lawrence Date: Sun, 17 Mar 2019 13:20:19 -0400 Subject: [PATCH 2/3] Advertise that the jruby-launcher gem is being installed --- bin/ruby-build | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/ruby-build b/bin/ruby-build index d6ea23b433..7fdf1cb9cf 100755 --- a/bin/ruby-build +++ b/bin/ruby-build @@ -737,6 +737,7 @@ build_package_disable_launcher() { } install_jruby_launcher() { + echo "Installing the jruby-launcher gem" cd "${PREFIX_PATH}/bin" { ./ruby gem install jruby-launcher } >&4 2>&1 From 90761270398cf57c0536b1e2c5fde13536ed433b Mon Sep 17 00:00:00 2001 From: Jay Lawrence Date: Sun, 17 Mar 2019 13:33:57 -0400 Subject: [PATCH 3/3] documentation --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f799fc50cf..952dd07f5c 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,7 @@ The build process may be configured through the following environment variables: | `RUBY_CONFIGURE_OPTS` | Additional `./configure` options (applies only to Ruby source). | | `RUBY_MAKE_OPTS` | Additional `make` options (applies only to Ruby source). | | `RUBY_MAKE_INSTALL_OPTS` | Additional `make install` options (applies only to Ruby source). | +| `JRUBY_DISABLE_LAUNCHER` | Do not install the jruby-launcher gem when installing JRuby | #### Applying Patches