Skip to content

include own lib dir in RPATH before system lib dirs in binutils easyblock #2044

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
akesandgren merged 2 commits into from
May 11, 2020
Merged

include own lib dir in RPATH before system lib dirs in binutils easyblock #2044

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f011fc
[binutils] Include own lib dir in rpath before system lib dirs
Flamefire Apr 27, 2020
352247a
[bintuils] Add option for using debuginfod
Flamefire Apr 27, 2020
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
21 changes: 17 additions & 4 deletions easybuild/easyblocks/b/binutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ def extra_options(extra_vars=None):
extra_vars = ConfigureMake.extra_options(extra_vars=extra_vars)
extra_vars.update({
'install_libiberty': [True, "Also install libiberty (implies building with -fPIC)", CUSTOM],
'use_debuginfod': [False, "Build with debuginfod (used from system)", CUSTOM],
})
return extra_vars

Expand All @@ -62,7 +63,11 @@ def configure_step(self):
# determine list of 'lib' directories to use rpath for;
# this should 'harden' the resulting binutils to bootstrap GCC
# (no trouble when other libstdc++ is build etc)
libdirs = []

# The installed lib dir must come first though to avoid taking system libs over installed ones, see:
# https://github.com/easybuilders/easybuild-easyconfigs/issues/10056
# Escaping: Double $$ for Make, \$ for shell to get literal $ORIGIN in the file
libdirs = [r'\$\$ORIGIN/../lib']
for libdir in ['/usr/lib', '/usr/lib64', '/usr/lib/x86_64-linux-gnu/']:
# also consider /lib, /lib64
alt_libdir = libdir.replace('usr/', '')
Expand All @@ -75,7 +80,8 @@ def configure_step(self):
elif os.path.exists(alt_libdir):
libdirs.append(alt_libdir)

libs += ' '.join('-Wl,-rpath=%s' % libdir for libdir in libdirs)
# Mind the single quotes
libs += ' '.join("-Wl,-rpath='%s'" % libdir for libdir in libdirs)

# configure using `--with-system-zlib` if zlib is a (build) dependency
zlibroot = get_software_root('zlib')
Expand All @@ -101,8 +107,9 @@ def configure_step(self):
else:
libs += ' ' + libz_path

self.cfg.update('preconfigopts', "env LIBS='%s'" % libs)
self.cfg.update('prebuildopts', "env LIBS='%s'" % libs)
# Using double quotes for LIBS to allow single quotes in libs
self.cfg.update('preconfigopts', 'LIBS="%s"' % libs)
self.cfg.update('prebuildopts', 'LIBS="%s"' % libs)

# use correct sysroot, to make sure 'ld' also considers system libraries
self.cfg.update('configopts', '--with-sysroot=/')
Expand All @@ -115,6 +122,12 @@ def configure_step(self):
if LooseVersion(self.version) > LooseVersion('2.24'):
self.cfg.update('configopts', "--enable-gold --enable-plugins --enable-ld=default")

if LooseVersion(self.version) >= LooseVersion('2.34'):
if self.cfg['use_debuginfod']:
self.cfg.update('configopts', '--with-debuginfod')
else:
self.cfg.update('configopts', '--without-debuginfod')

# complete configuration with configure_method of parent
super(EB_binutils, self).configure_step()

Expand Down