Skip to content

take into account that zlib may be listed in --filter-deps in custom easyblock for XML R package #2189

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
merged 1 commit into from
Sep 27, 2020
Merged

take into account that zlib may be listed in --filter-deps in custom easyblock for XML R package #2189

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions easybuild/easyblocks/x/xml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import easybuild.tools.environment as env
from easybuild.easyblocks.generic.rpackage import RPackage
from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.config import build_option
from easybuild.tools.modules import get_software_root


Expand All @@ -44,9 +45,11 @@ def install_R_package(self, cmd, inp=None):
libs = os.getenv('LIBS', '')
zlib = get_software_root('zlib')

if not zlib:
if zlib:
env.setvar('LIBS', "%s -L%s" % (libs, os.path.join(zlib, 'lib')))
elif 'zlib' in build_option('filter_deps'):
self.log.info("zlib included in list of filtered dependencies, so no need to tweak $LIBS")
else:
raise EasyBuildError("zlib module not loaded (required)")

env.setvar('LIBS', "%s -L%s" % (libs, os.path.join(zlib, 'lib')))

super(EB_XML, self).install_R_package(cmd, inp)