fix: Use environment CXX to configure fastjet-contrib .Makefile.inc #276
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
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 |
lgray
force-pushed
the
fix/correctly-use-undefine
branch
from
b14e598 to
6c5b70e
Compare
matthewfeickert
force-pushed
the
fix/correctly-use-undefine
branch
from
6c5b70e to
74d0b68
Compare
matthewfeickert
changed the title
matthewfeickert
force-pushed
the
fix/correctly-use-undefine
branch
from
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.
matthewfeickert
force-pushed
the
fix/correctly-use-undefine
branch
from
35c33a3 to
b11bbda
Compare
|
@lgray @chrispap95 I found my typo and so this is passing now and ready for review. |
chrispap95
approved these changes
Feb 18, 2024
|
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. 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fastjet-contrib's.Makefile.incis created at./configuretime, which means that if the environment'sCXXis accessible inside ofsetup.pyit can be passed as an argument toconfigure. Use this to setCXXforfastjet-contrib/.Makefile.incand use a default value ofg++if no environment value is set..Makefile.inc, which was being overwritten, remove that patch file and the.Makefile.incpatching step fromsetup.py.Amends PR #275
c.f. lgray/staged-recipes#2 for an example of this being applied as a patch.