-
Notifications
You must be signed in to change notification settings - Fork 25
/
Copy path.cherry-pick
39 lines (28 loc) · 2 KB
/
.cherry-pick
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
git remote add jmcarcell https://github.com/jmcarcell/spack || true
git fetch jmcarcell -q
# Hardcode CMAKE_INSTALL_LIBDIR to lib. This is needed for AlmaLinux 9 where
# CMAKE_INSTALL_LIBDIR gets chosen as lib64 and this causes problems in some
# packages that expect lib. Since spack installs each package to its own prefix
# we don't need to worry about multilib environments
git cherry-pick dcedd688a077ba5399b1a77275364b8164eab41f -X theirs --no-commit
# Because the patch above and py-onnx being a python package, it will try to find
# protobuf in CMAKE_INSTALL_LIBDIR which is lib64 so a symlink is created here
git cherry-pick 3ec184fad8582cc501f55e0ea0b0f6b3fb9b70bf -X theirs --no-commit
# add vdt for CPATH, needed for podio+rntuple
git cherry-pick f97fabc3ff12527e5220ea6917719a73f8bd4315 -X theirs --no-commit
# podio: add rpath, remove when https://github.com/spack/spack/pull/42844 is merged
curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/42844.diff | patch -p1
# py-awkward: add py-importlib-metadata to the dependencies, remove!
git cherry-pick a2e5fecea7740ee522a4978784082e9a9106bb58 -X theirs --no-commit
# pandora: set the C++ standards, remove when https://github.com/spack/spack/pull/48300 is merged
git cherry-pick b61942b3d57f492d09fb4da3e681f88d683f9563 -X theirs --no-commit
# gaudi: add v39.2 and a fix for compiling on GCC 11, remove!
curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/48557.diff | patch -p1
# pandoramonitoring: add patch for C++20, remove!
git cherry-pick 04b786bcdeddbfbcfe5a4e4985eb4ec9415e22b5 -X theirs --no-commit
# py-pyqt5: add gmake as a dependency, remove!
git cherry-pick a87e8fc95948cde3ea425303a76d36d1768a6b3c -X theirs --no-commit
# gtkplus: add conflict with GCC14, remove when https://github.com/spack/spack/pull/48661 is merged
git cherry-pick 1e85e2f27582dc105e7b7d9e668e32b5b9e696f8 -X theirs --no-commit
# acts: add patch to find python before DD4hep
git cherry-pick d8bb37270ee2f84bbaa6432cf1aa3dbea421ec9d -X theirs --no-commit