sherpa: only use enable_or_disable in v3 series#41162
Merged
Conversation
iarspider
approved these changes
Nov 20, 2023
Contributor
|
LGTM |
alalazo
approved these changes
Nov 20, 2023
gabrielctn
pushed a commit
to gabrielctn/spack
that referenced
this pull request
Nov 24, 2023
This was referenced Nov 29, 2023
mtaillefumier
pushed a commit
to mtaillefumier/spack
that referenced
this pull request
Dec 14, 2023
RikkiButler20
pushed a commit
to RikkiButler20/spack
that referenced
this pull request
Jan 31, 2024
This file contains hidden or 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
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.
The treatment of issue sherpa#348 with PR sherpa!497 was merged later than anticipated, not in time for the 2.2.13 series (or any 2.2.* release). The PR was merged into master, but is only in v3.0.0beta1. This bug prevents using sherpa with
-hepmc3,-lhapdf, or-rivet(where-rivetis default; the others enabled by default) for all v2.2.* releases, and due to theifin spack, the workaround is only applied for versions up to 2.2.12 in spack. With this PR, the workaround is applied for all v2.2.* releases.Tested that this PR causes 2.2.15 to compile Rivet support when
+rivet, and not when-rivet. This does requirecxxstddifferent from the default 11 (I used 14), since the Rivet headers include c++14 unique_ptr. Fixing that (specifying when whichcxxstdis ok) will be for a different PR...