Skip to content
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: Add patch to add .Makefile.inc to fastjet-contrib #275

Merged
merged 1 commit into from
Feb 17, 2024

Conversation

matthewfeickert
Copy link
Member

@matthewfeickert matthewfeickert commented Feb 17, 2024

  • As each contribution in fastjet-contrib has their own Makefile which defines CXX and CXXFLAGS it is necessary to use a globally used .Makefile.inc to change these everywhere. For fastjet to be able to control the values from the environment that fastjet is being built in, use a .Makefile.inc patch to undefine CXX and CXXFLAGS for Make. This allows for the environment varaibles to be picked up.
  • Remove patch_makefilein.txt as patch_makefileinc.txt supreceeds it.

Amends PR #191 and is needed for conda-forge/staged-recipes#21052

* As each contribution in fastjet-contrib has their own Makefile which
  defines CXX and CXXFLAGS it is necessary to use a globally used
  .Makefile.inc to change these everywhere. For fastjet to be able to
  control the values from the environment that fastjet is being built
  in, use a .Makefile.inc patch to undefine CXX and CXXFLAGS for Make.
  This allows for the environment varaibles to be picked up.
* Remove patch_makefilein.txt as patch_makefileinc.txt supreceeds it.
@lgray lgray force-pushed the fix/add-additional-patch-for-fastjet-contrib branch from f7df4b5 to 3760f63 Compare February 17, 2024 01:01
@lgray lgray merged commit 0a70df4 into main Feb 17, 2024
12 checks passed
@lgray lgray deleted the fix/add-additional-patch-for-fastjet-contrib branch February 17, 2024 01:30
@matthewfeickert
Copy link
Member Author

Thanks for the fast review @lgray!

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