diff --git a/var/spack/repos/builtin/packages/libtiff/no-include-root.patch b/var/spack/repos/builtin/packages/libtiff/no-include-root.patch index edd02c6c797..4ae62802115 100644 --- a/var/spack/repos/builtin/packages/libtiff/no-include-root.patch +++ b/var/spack/repos/builtin/packages/libtiff/no-include-root.patch @@ -1,51 +1,11 @@ -From b25618f6fcaf5b39f0a5b6be3ab2fb288cf7a75b Mon Sep 17 00:00:00 2001 -From: Timothy Lyanguzov -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 -"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 --------------------------------------------------------------------------- +--- a/configure 2021-04-16 05:56:02.000000000 -0500 ++++ b/configure 2021-12-29 20:54:02.000000000 -0600 +@@ -21016,7 +21016,7 @@ - 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 +-ac_config_headers="$ac_config_headers config.h libtiff/tif_config.h libtiff/tiffconf.h port/libport_config.h" ++ac_config_headers="$ac_config_headers config/config.h libtiff/tif_config.h libtiff/tiffconf.h port/libport_config.h" - dnl --------------------------------------------------------------------------- --- -GitLab - + + ac_config_files="$ac_config_files Makefile build/Makefile contrib/Makefile contrib/addtiffo/Makefile contrib/dbs/Makefile contrib/dbs/xtiff/Makefile contrib/iptcutil/Makefile contrib/mfs/Makefile contrib/pds/Makefile contrib/ras/Makefile contrib/stream/Makefile contrib/tags/Makefile contrib/win_dib/Makefile html/Makefile html/images/Makefile html/man/Makefile libtiff-4.pc libtiff/Makefile man/Makefile port/Makefile test/Makefile tools/Makefile"