summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Madlener <thomas.madlener@desy.de>2024-09-26 15:29:58 +0200
committerGitHub <noreply@github.com>2024-09-26 15:29:58 +0200
commitbbd205543b09139f2f57f21099eb366c9f183d76 (patch)
tree050c90f4625627e623be9a6f866a281cd278b652
parentb95160cd868b869c94691c06bfbd133405b9363b (diff)
downloadspack-bbd205543b09139f2f57f21099eb366c9f183d76.tar.gz
spack-bbd205543b09139f2f57f21099eb366c9f183d76.tar.bz2
spack-bbd205543b09139f2f57f21099eb366c9f183d76.tar.xz
spack-bbd205543b09139f2f57f21099eb366c9f183d76.zip
py-onnx: build 1.15 with c++17 / c++20 when neeed (#46571)
-rw-r--r--var/spack/repos/builtin/packages/py-onnx/package.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/py-onnx/package.py b/var/spack/repos/builtin/packages/py-onnx/package.py
index e8286c232e..288b7c1c65 100644
--- a/var/spack/repos/builtin/packages/py-onnx/package.py
+++ b/var/spack/repos/builtin/packages/py-onnx/package.py
@@ -70,3 +70,16 @@ class PyOnnx(PythonPackage):
# 'python_out' does not recognize dllexport_decl.
patch("remove_dllexport_decl.patch", when="@:1.6.0")
+
+ # Switch the CMAKE_CXX_STANDARD to 17 if abseil-cpp has been built with
+ # either of those. (abseil-cpp is pulled in via protobuf)
+ patch(
+ "https://github.com/onnx/onnx/commit/1f6e43cb4d7366b2dffa7f70ae88198306e12c6c.patch?full_index=1",
+ sha256="be12f589bc4113982e4162efcdbd95835a6c161a9a7e10cd1dde026cadedf8aa",
+ when="@1.15.0 ^abseil-cpp cxxstd=17",
+ )
+ patch(
+ "https://github.com/onnx/onnx/commit/1f6e43cb4d7366b2dffa7f70ae88198306e12c6c.patch?full_index=1",
+ sha256="be12f589bc4113982e4162efcdbd95835a6c161a9a7e10cd1dde026cadedf8aa",
+ when="@1.15.0 ^abseil-cpp cxxstd=20",
+ )