Make configure and make look for FoX in EBROOTFOX in QuantumESPRESSO easyblock#1420
Make configure and make look for FoX in EBROOTFOX in QuantumESPRESSO easyblock#1420boegel merged 2 commits intoeasybuilders:developfrom
Conversation
| regex_subs = [ | ||
| (r"\(TOPDIR\)/FoX/finclude", | ||
| r"(EBROOTFOX)/finclude"), | ||
| ] |
There was a problem hiding this comment.
Isn't it more clear to collapse this to a single line, since it's only a single substitution?
regex_subs = [(r"\(TOPDIR\)/FoX/finclude", r"(EBROOTFOX)/finclude")]There was a problem hiding this comment.
I am just following the same style than above.
There was a problem hiding this comment.
Well, ok, the one above should be changed too ;)
| r"(EBROOTFOX)/finclude"), | ||
| ] | ||
| apply_regex_substitutions('install/configure', regex_subs) | ||
| apply_regex_substitutions('make.inc', regex_subs) |
There was a problem hiding this comment.
Do you also need to patch make.inc? Doesn't seem to make any difference w.r.t. FoX include dir?
There was a problem hiding this comment.
There's a reference to -I$(TOPDIR)/FoX/finclude there. I am unsure if it is really used, but I think it is better to play it safe and change it there. Or check it :-P
There was a problem hiding this comment.
The reference is to -L$(TOPDIR)/FoX/lib, and it's not getting patched currently:
$ grep TOPDIR make.inc* | grep FoX
make.inc:FOX_LIB = -L$(TOPDIR)/FoX/lib -lFoX_dom -lFoX_sax -lFoX_wxml -lFoX_common\
make.inc.orig.eb:FOX_LIB = -L$(TOPDIR)/FoX/lib -lFoX_dom -lFoX_sax -lFoX_wxml -lFoX_common\
Maybe simplify the regex to make it just replace \(TOPDIR\)/FoX/ with (EBROOTFOX)/ ?
|
Works like a charm now, so going in, thanks @damianam! |
No description provided.