Skip to content

also build SARtools and Envisat tools for Doris#1161

Merged
boegel merged 2 commits intoeasybuilders:developfrom
boegel:doris_tools
Apr 6, 2017
Merged

also build SARtools and Envisat tools for Doris#1161
boegel merged 2 commits intoeasybuilders:developfrom
boegel:doris_tools

Conversation

@boegel
Copy link
Copy Markdown
Member

@boegel boegel commented Apr 5, 2017

follow-up for #1154

@boegel boegel added this to the 3.2.0 milestone Apr 5, 2017
@boegel
Copy link
Copy Markdown
Member Author

boegel commented Apr 5, 2017

@wpoely86 please review?

self.cfg['buildopts'] = common_buildopts
self.cfg.update('buildopts', 'CC="%s"' % os.getenv('CXX'))
cflags = os.getenv('CFLAGS') + " -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
self.cfg.update('buildopts', 'CFLAGS="%s"' % cflags)
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.

CXXFLAGS?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

well, I need to define CFLAGS, but I should use the $CXXFLAGS value as defined by EasyBuild here, yes

Comment thread easybuild/easyblocks/d/doris.py Outdated
'files': ['bin/cpx2ps', 'bin/doris', 'bin/plotcpm', 'bin/run'],
'files': [os.path.join('bin', x) for x in ['cpx2ps', 'doris', 'plotcpm', 'run']] +
[os.path.join('bin', x) for x in ['bkconvert', 'cpxfiddle', 'flapjack', 'floatmult', 'wrap']] +
[os.path.join('bin', x) for x in ['envisat_dump_header', 'envisat_dump_data']],
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.

why not put them all in a list variable outside this dict?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I grouped them by origin (Doris vs SARtools vs ENVISAT_TOOLS), I'll include a comment to make that clear

@boegel
Copy link
Copy Markdown
Member Author

boegel commented Apr 6, 2017

Thanks for the review @wpoely86!

@boegel boegel merged commit 2ca0e61 into easybuilders:develop Apr 6, 2017
@boegel boegel deleted the doris_tools branch April 6, 2017 09:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants