From 45a67fa0f37ade10c440bab3f1034aa1e975e01b Mon Sep 17 00:00:00 2001
From: ketsubouchi <67359246+ketsubouchi@users.noreply.github.com>
Date: Fri, 31 Jul 2020 12:18:55 +0900
Subject: [PATCH] dcmtk: fixed type error (#17758)
* dcmtk: fixed type error
* Update var/spack/repos/builtin/packages/dcmtk/package.py
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
---
var/spack/repos/builtin/packages/dcmtk/package.py | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/var/spack/repos/builtin/packages/dcmtk/package.py b/var/spack/repos/builtin/packages/dcmtk/package.py
index 2bf3db66d1..7b5fab7f64 100644
--- a/var/spack/repos/builtin/packages/dcmtk/package.py
+++ b/var/spack/repos/builtin/packages/dcmtk/package.py
@@ -37,6 +37,16 @@ class Dcmtk(CMakePackage):
variant('cxx11', default=False, description="Enable c++11 features")
variant('stl', default=True, description="Use native STL implementation")
+ def patch(self):
+ # Backport 3.6.4
+ if self.spec.satisfies('@:3.6.3 %fj'):
+ filter_file(
+ 'OFintegral_constant<size_t,-1>',
+ 'OFintegral_constant<size_t,~OFstatic_cast(size_t,0)>',
+ 'ofstd/include/dcmtk/ofstd/variadic/helpers.h',
+ string=True
+ )
+
def cmake_args(self):
args = ["-DDCMTK_WITH_OPENSSL={0}".format(
'ON' if '+ssl' in self.spec else 'OFF')]
--
GitLab