From bbd205543b09139f2f57f21099eb366c9f183d76 Mon Sep 17 00:00:00 2001 From: Thomas Madlener Date: Thu, 26 Sep 2024 15:29:58 +0200 Subject: py-onnx: build 1.15 with c++17 / c++20 when neeed (#46571) --- var/spack/repos/builtin/packages/py-onnx/package.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'var') 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", + ) -- cgit v1.2.3-70-g09d2