Skip to content

Added support for shared libs to trilinos easyblock#1339

Merged
boegel merged 2 commits intoeasybuilders:developfrom
sara-nl:trilinos-shared-libs
Jan 9, 2018
Merged

Added support for shared libs to trilinos easyblock#1339
boegel merged 2 commits intoeasybuilders:developfrom
sara-nl:trilinos-shared-libs

Conversation

@jdonners
Copy link
Copy Markdown

@jdonners jdonners commented Jan 9, 2018

The sanity check only searched for static libraries previously.

Comment thread easybuild/easyblocks/t/trilinos.py Outdated

custom_paths = {
'files': [os.path.join('lib', 'lib%s.a' % x.lower()) for x in libs],
'files': [os.path.join('lib', 'lib%s' % x.lower()+lib_ext) for x in libs],
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jdonners I'd slightly change this to:

'files': [os.path.join('lib', 'lib%s.%s' % (x.lower(), lib_ext)) for x in libs],

Comment thread easybuild/easyblocks/t/trilinos.py Outdated
if self.cfg['shared_libs']:
lib_ext = "." + get_shared_lib_ext()
else:
lib_ext = ".a"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A one-liner here could be:

lib_ext = ('a', get_shared_lib_ext())[self.cfg['shared_libs']]

But that's probably a bit hard to read. ;-)

I'd exclude the . here, that makes the below easier to read:

if self.cfg['shared_libs']:
    lib_ext = get_shared_lib_ext()
else:
    lib_ext = 'a'

@boegel boegel added this to the 3.5.1 milestone Jan 9, 2018
@boegel boegel added the bug fix label Jan 9, 2018
@boegel boegel merged commit 08ba8ed into easybuilders:develop Jan 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants