From b3e2975a28ed95b289ec41da94fa76ed11404e2a Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Tue, 28 May 2024 07:57:26 +0200 Subject: [PATCH] Change the order of cherry picks --- .cherry-pick | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.cherry-pick b/.cherry-pick index aa9dfadf..cdff2887 100644 --- a/.cherry-pick +++ b/.cherry-pick @@ -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 @@ -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