libtiff: remove extra dependencies/patch (#30854)

2 files changed, 6 insertions, 72 deletions

diff --git a/var/spack/repos/builtin/packages/libtiff/no-include-root.patch b/var/spack/repos/builtin/packages/libtiff/no-include-root.patch
deleted file mode 100644
index edd02c6c79..0000000000
--- a/var/spack/repos/builtin/packages/libtiff/no-include-root.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b25618f6fcaf5b39f0a5b6be3ab2fb288cf7a75b Mon Sep 17 00:00:00 2001
-From: Timothy Lyanguzov <timothy.lyanguzov@sap.com>
-Date: Thu, 29 Apr 2021 13:14:18 +1200
-Subject: [PATCH] Prevent adding root directory to include list
-
-there is a file VERSION in the root directory which clashes with C++20 standard header <version>
-"config.h" file is created in "config" subdirectory to prevent adding "-I.." to generated Makefile
-
-closes #218, #252
----
- .gitignore   |  2 ++
- configure.ac | 12 ++++++------
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9e419fba..9e992792 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1080,7 +1080,7 @@ dnl ---------------------------------------------------------------------------
- 
- AC_SUBST(LIBDIR)
- 
--AC_CONFIG_HEADERS([config.h libtiff/tif_config.h libtiff/tiffconf.h port/libport_config.h])
-+AC_CONFIG_HEADERS([config/config.h libtiff/tif_config.h libtiff/tiffconf.h port/libport_config.h])
- 
- AC_CONFIG_FILES([Makefile \
- 		 build/Makefile \
-@@ -1095,15 +1095,15 @@ AC_CONFIG_FILES([Makefile \
- 		 contrib/stream/Makefile \
- 		 contrib/tags/Makefile \
- 		 contrib/win_dib/Makefile \
--                 html/Makefile \
-+		 html/Makefile \
- 		 html/images/Makefile \
- 		 html/man/Makefile \
--                 libtiff-4.pc \
--                 libtiff/Makefile \
--                 man/Makefile \
-+		 libtiff-4.pc \
-+		 libtiff/Makefile \
-+		 man/Makefile \
- 		 port/Makefile \
- 		 test/Makefile \
--                 tools/Makefile])
-+		 tools/Makefile])
- AC_OUTPUT
- 
- dnl ---------------------------------------------------------------------------
--- 
-GitLab
-
diff --git a/var/spack/repos/builtin/packages/libtiff/package.py b/var/spack/repos/builtin/packages/libtiff/package.py
index 5bde7d3ab6..f0324b108e 100644
--- a/var/spack/repos/builtin/packages/libtiff/package.py
+++ b/var/spack/repos/builtin/packages/libtiff/package.py
@@ -14,8 +14,13 @@ class Libtiff(AutotoolsPackage):
 
     maintainers = ['adamjstewart']
 
+    # 4.3.0 contains a bug that breaks the build on case-sensitive filesystems when
+    # using a C++20-capable compiler (commonly the case on macOS). Patch adds a lot
+    # of unnecessary dependencies, so prefer 4.2.0 for now. `preferred=True` can be
+    # removed once a 4.4.0 release comes out. For more details, see:
+    # https://gitlab.com/libtiff/libtiff/-/merge_requests/243
     version('4.3.0',  sha256='0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8')
-    version('4.2.0',  sha256='eb0484e568ead8fa23b513e9b0041df7e327f4ee2d22db5a533929dfc19633cb')
+    version('4.2.0',  sha256='eb0484e568ead8fa23b513e9b0041df7e327f4ee2d22db5a533929dfc19633cb', preferred=True)
     version('4.1.0',  sha256='5d29f32517dadb6dbcd1255ea5bbc93a2b54b94fbf83653b4d65c7d6775b8634')
     version('4.0.10', sha256='2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4')
     version('4.0.9',  sha256='6e7bdeec2c310734e734d19aae3a71ebe37a4d842e0e23dbb1b8921c0026cfcd')
@@ -55,26 +60,6 @@ class Libtiff(AutotoolsPackage):
     conflicts('+zstd', when='@:4.0.9')
     conflicts('+webp', when='@:4.0.9')
 
-    # https://gitlab.com/libtiff/libtiff/-/merge_requests/243
-    patch('no-include-root.patch', when='@4.3.0 platform=darwin')
-
-    depends_on('gl', when='@4.3.0 platform=darwin')
-    depends_on('glu', when='@4.3.0 platform=darwin')
-    depends_on('freeglut', when='@4.3.0 platform=darwin')
-    depends_on('libsm', when='@4.3.0 platform=darwin')
-    depends_on('libice', when='@4.3.0 platform=darwin')
-    depends_on('libxi', when='@4.3.0 platform=darwin')
-    depends_on('libx11', when='@4.3.0 platform=darwin')
-
-    depends_on('automake', when='@4.3.0 platform=darwin', type='build')
-    depends_on('autoconf', when='@4.3.0 platform=darwin', type='build')
-    depends_on('libtool', when='@4.3.0 platform=darwin', type='build')
-    depends_on('m4', when='@4.3.0 platform=darwin', type='build')
-
-    @property
-    def force_autoreconf(self):
-        return self.spec.satisfies('@4.3.0 platform=darwin')
-
     def patch(self):
         # Remove flags not recognized by the NVIDIA compiler
         if self.spec.satisfies('%nvhpc@:20.11'):