Skip to content

Make RubyGem extension EB use GEM_ envs except if installed with Ruby itself #1247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boegel merged 3 commits into from
Dec 27, 2017
Merged

Make RubyGem extension EB use GEM_ envs except if installed with Ruby itself #1247

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d98784d
Make RubyGem extension EB use GEM_ envs except if installed with Ruby…
Sep 15, 2017
9e22002
unnecessary import removed
Sep 15, 2017
c3a163e
use self.master.name != 'Ruby'
Dec 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions easybuild/easyblocks/generic/rubygem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def install_step(self):
raise EasyBuildError("Ruby module not loaded?")

# this is the 'proper' way to specify a custom installation prefix: set $GEM_HOME
if not self.is_extension:
if not self.is_extension or self.master.name != 'Ruby':
env.setvar('GEM_HOME', self.installdir)

bindir = os.path.join(self.installdir, 'bin')
Expand All @@ -100,6 +100,6 @@ def make_module_extra(self):
"""Extend $GEM_PATH in module file."""
txt = super(RubyGem, self).make_module_extra()
# for stand-alone Ruby gem installs, $GEM_PATH needs to be updated
if not self.is_extension:
if not self.is_extension or self.master.name != 'Ruby':
txt += self.module_generator.prepend_paths('GEM_PATH', [''])
return txt