Skip to content

Commit

Permalink
Change the order of cherry picks
Browse files Browse the repository at this point in the history
  • Loading branch information
jmcarcell committed May 28, 2024
1 parent 065691d commit b3e2975
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .cherry-pick
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/41128.diff
# add vdt for CPATH, needed for podio+rntuple
git cherry-pick f97fabc3ff12527e5220ea6917719a73f8bd4315 -X theirs --no-commit

# whizard: Fix building with +openmp,
git cherry-pick 78581b6db70e681e21ca0e62b450cb2df002fafc -X theirs --no-commit

# Add a patch to fix whizard (re pythia8), remove!
curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43045.diff | patch -p1

Expand Down Expand Up @@ -34,8 +37,6 @@ curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43859.diff
# py-onnxruntime: Install the session headers, needed by FCCAnalyses
git cherry-pick e272ffa5a4768d23f1579403f9872360630e7278 -X theirs --no-commit

# whizard: Fix building with +openmp,
git cherry-pick 78581b6db70e681e21ca0e62b450cb2df002fafc -X theirs --no-commit


if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="centos"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="7"' ]]; then
Expand Down

0 comments on commit b3e2975

Please sign in to comment.