diff --git a/spack.sh b/spack.sh index 11794f2dad97bfb680bf2fcb83fd6b0f24a1cc15..a655ae0be8d47fdbf50bd721f72a255935270935 100644 --- a/spack.sh +++ b/spack.sh @@ -30,12 +30,14 @@ a66586d749197841bd74e289802126f2359287a8 7503a417731910d918a7863d1862f62c9b76429d f8f01c336c882f29ac364995423b9f69ac365462 6051d56014730528da8dfa69934d93f9b7941a70 +7b9f8abce5cee74546a6f588f88c6f353170d52b 096ab11961995ac8d69f7b177cbcadf618d3068e 6c4abef75cb2b98c337f8a3179797e29dfdc9ca3 --- ## Optional hash table with comma-separated file list read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ --- || true +[7b9f8abce5cee74546a6f588f88c6f353170d52b]=var/spack/repos/builtin/packages/protobuf/package.py,var/spack/repos/builtin/packages/py-protobuf/package.py --- ## Ref: https://github.com/spack/spack/commit/[hash] ## [hash]: [description] @@ -61,5 +63,6 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ ## 7503a417731910d918a7863d1862f62c9b76429d: cuda: add v12.4.1 ## f8f01c336c882f29ac364995423b9f69ac365462: clang: support cxx20_flag and cxx23_flag ## 6051d56014730528da8dfa69934d93f9b7941a70: fastjet: avoid plugins=all,cxx combinations +## 7b9f8abce5cee74546a6f588f88c6f353170d52b: Add depends_on([c,cxx,fortran]) ## 096ab11961995ac8d69f7b177cbcadf618d3068e: py-onnx: link to external protobuf ## 6c4abef75cb2b98c337f8a3179797e29dfdc9ca3: py-protobuf: drop +cpp, always require protobuf