zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DCMTK: fix build with libtiff (#45213)

Browse Source
This commit is contained in:
Adam J. Stewart 2024-07-15 22:02:19 +02:00 committed by GitHub
parent d4e6c29f25
commit 652170fb54
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/dcmtk/package.py
View File

@ -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"):

12
var/spack/repos/builtin/packages/dcmtk/tiff-3.6.7.patch Normal file
View File

@ -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()