summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2024-07-15 22:02:19 +0200
committerGitHub <noreply@github.com>2024-07-15 22:02:19 +0200
commit652170fb54bdd58b22f7487bf2678e3e053c1e77 (patch)
tree97db1e1405249469633af5233e7c2dcc3eaad1b3
parentd4e6c29f2518c491614eb836a9578d5de0690255 (diff)
downloadspack-652170fb54bdd58b22f7487bf2678e3e053c1e77.tar.gz
spack-652170fb54bdd58b22f7487bf2678e3e053c1e77.tar.bz2
spack-652170fb54bdd58b22f7487bf2678e3e053c1e77.tar.xz
spack-652170fb54bdd58b22f7487bf2678e3e053c1e77.zip
DCMTK: fix build with libtiff (#45213)
-rw-r--r--var/spack/repos/builtin/packages/dcmtk/package.py2
-rw-r--r--var/spack/repos/builtin/packages/dcmtk/tiff-3.6.7.patch12
2 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/dcmtk/package.py b/var/spack/repos/builtin/packages/dcmtk/package.py
index f6c14c642e..fe3a0b4a7c 100644
--- a/var/spack/repos/builtin/packages/dcmtk/package.py
+++ b/var/spack/repos/builtin/packages/dcmtk/package.py
@@ -50,6 +50,8 @@ class Dcmtk(CMakePackage):
conflicts("platform=darwin target=aarch64:", when="@:3.6.6")
+ patch("tiff-3.6.7.patch", when="@3.6.7")
+
def patch(self):
# Backport 3.6.4
if self.spec.satisfies("@:3.6.3 %fj"):
diff --git a/var/spack/repos/builtin/packages/dcmtk/tiff-3.6.7.patch b/var/spack/repos/builtin/packages/dcmtk/tiff-3.6.7.patch
new file mode 100644
index 0000000000..53df4e75eb
--- /dev/null
+++ b/var/spack/repos/builtin/packages/dcmtk/tiff-3.6.7.patch
@@ -0,0 +1,12 @@
+diff --color=auto --color=never -Naur a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake
+--- a/CMake/3rdparty.cmake 2022-04-28 15:47:25
++++ b/CMake/3rdparty.cmake 2024-07-12 15:04:19
+@@ -38,7 +38,7 @@
+ message(STATUS "Info: DCMTK TIFF support will be enabled")
+ include_directories(${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR})
+ endif()
+- set(LIBTIFF_LIBS ${TIFF_LIBRARY} ${TIFF_EXTRA_LIBS_STATIC} ${JPEG_LIBRARY})
++ set(LIBTIFF_LIBS ${TIFF_LIBRARIES} ${TIFF_EXTRA_LIBS_STATIC} ${JPEG_LIBRARIES})
+ endif()
+ endif()
+