From 9e1fef8813a4e02e0be4483366a296b4abeb2741 Mon Sep 17 00:00:00 2001 From: Mosè Giordano Date: Sun, 20 Nov 2022 22:20:11 -0600 Subject: texinfo: require also `makeinfo` executable (#33370) * texinfo: require also `makeinfo` executable * texinfo: add versions 6.6, 6.7, 6.8 * texinfo: add `info` and `makeinfo` sanity checks --- var/spack/repos/builtin/packages/texinfo/package.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/texinfo/package.py b/var/spack/repos/builtin/packages/texinfo/package.py index e67704b79a..c6f1b769b4 100644 --- a/var/spack/repos/builtin/packages/texinfo/package.py +++ b/var/spack/repos/builtin/packages/texinfo/package.py @@ -23,6 +23,9 @@ class Texinfo(AutotoolsPackage, GNUMirrorPackage): tags = ["build-tools"] + version("6.8", sha256="8e09cf753ad1833695d2bac0f57dc3bd6bcbbfbf279450e1ba3bc2d7fb297d08") + version("6.7", sha256="a52d05076b90032cb2523673c50e53185938746482cf3ca0213e9b4b50ac2d3e") + version("6.6", sha256="900723b220baa4672c4214a873a69ecbe1cb5f14c926a1a4bbb230ac309294cb") version("6.5", sha256="d34272e4042c46186ddcd66bd5d980c0ca14ff734444686ccf8131f6ec8b1427") version("6.3", sha256="300a6ba4958c2dd4a6d5ce60f0a335daf7e379f5374f276f6ba31a221f02f606") version("6.0", sha256="83d3183290f34e7f958d209d0b20022c6fe9e921eb6fe94c27d988827d4878d2") @@ -32,16 +35,22 @@ class Texinfo(AutotoolsPackage, GNUMirrorPackage): depends_on("perl") + # sanity check + sanity_check_is_file = [ + join_path("bin", "info"), + join_path("bin", "makeinfo"), + ] + # Fix unescaped braces in regexps. # Ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=898994 - patch("fix_unescaped_braces.patch", when="@6.3:") + patch("fix_unescaped_braces.patch", when="@6.3:6.5") patch("fix_unescaped_braces_2.patch", when="@5.1:6.0") patch("fix_unescaped_braces_3.patch", when="@5.0") # Apply this fix to perform thread-safe processing in code # that uses the global locale. # Ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=902771 - patch("update_locale_handling.patch", when="@6.3:") + patch("update_locale_handling.patch", when="@6.3:6.5") patch("nvhpc.patch", when="%nvhpc") -- cgit v1.2.3-60-g2f50