-
Notifications
You must be signed in to change notification settings - Fork 12
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.
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
fix: Use environment CXX to configure fastjet-contrib .Makefile.inc #276
Conversation
Note to future awake self: Use the relevant parts of the patch you wrote in lgray/staged-recipes#2 and then just remove all of Lines 104 to 109 in 0a70df4
|
b14e598
to
6c5b70e
Compare
6c5b70e
to
74d0b68
Compare
74d0b68
to
35c33a3
Compare
* fastjet-contrib's .Makefile.inc is created at ./configure time, which means that if the environment's CXX is accessible inside of setup.py it can be passed as an argument to configure. Use this to set CXX for fastjet-contrib/.Makefile.inc and use a default value of g++ if no environment value is set. * As this supersedes the need for patching .Makefile.inc, which was being overwritten, remove that patch file and the .Makefile.inc patching step from setup.py.
35c33a3
to
b11bbda
Compare
@lgray @chrispap95 I found my typo and so this is passing now and ready for review. |
As this was used in lgray/staged-recipes#2 and approved there I'm going to assume that Lindsey is fine with me removing the patch, as it gets overwritten anyway, and merge this. If not, we can always revert. 👍 |
fastjet-contrib
's.Makefile.inc
is created at./configure
time, which means that if the environment'sCXX
is accessible inside ofsetup.py
it can be passed as an argument toconfigure
. Use this to setCXX
forfastjet-contrib/.Makefile.inc
and use a default value ofg++
if no environment value is set..Makefile.inc
, which was being overwritten, remove that patch file and the.Makefile.inc
patching step fromsetup.py
.Amends PR #275
c.f. lgray/staged-recipes#2 for an example of this being applied as a patch.