From 6f5ec730871fdbb0b3454c6873acda240152ee31 Mon Sep 17 00:00:00 2001 From: bernhardkaindl <43588962+bernhardkaindl@users.noreply.github.com> Date: Fri, 3 Sep 2021 23:04:59 +0200 Subject: m4: fix glitch in the test suite (#25702) --- var/spack/repos/builtin/packages/m4/package.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/var/spack/repos/builtin/packages/m4/package.py b/var/spack/repos/builtin/packages/m4/package.py index d39ac2450d..fb5bc07bbd 100644 --- a/var/spack/repos/builtin/packages/m4/package.py +++ b/var/spack/repos/builtin/packages/m4/package.py @@ -33,6 +33,12 @@ class M4(AutotoolsPackage, GNUMirrorPackage): patch('secure_snprintf.patch', when='@:1.4.18 os=bigsur') # https://bugzilla.redhat.com/show_bug.cgi?id=1573342 patch('https://src.fedoraproject.org/rpms/m4/raw/5d147168d4b93f38a4833f5dd1d650ad88af5a8a/f/m4-1.4.18-glibc-change-work-around.patch', sha256='fc9b61654a3ba1a8d6cd78ce087e7c96366c290bc8d2c299f09828d793b853c8', when='@1.4.18') + # from: https://www.mail-archive.com/m4-patches@gnu.org/msg01208.html + # tests: Fix failing test checks/198.sysval with upstream patch for doc/m4.texi + patch('http://git.savannah.gnu.org/cgit/m4.git/patch/?id=a1354086', + sha256='bfdffa7c2eb01021d5849b36972c069693654ad826c1a20b53534009a4ec7a89', when='@1.4.19') + patch('http://git.savannah.gnu.org/cgit/m4.git/patch/?id=cd7f4d15', + sha256='9dc5fbd0d5cb1037ab1e6d0ecc74a30df218d0a94bdd5a02759a97f62daca573', when='@1.4.19') variant('sigsegv', default=True, description="Build the libsigsegv dependency") @@ -45,6 +51,12 @@ class M4(AutotoolsPackage, GNUMirrorPackage): executables = ['^g?m4$'] + @when('@1.4.19') + def patch(self): + """ skip texinfo of m4.info for patched m4.texi (patched only a test in it) """ + touch('doc/m4.info') + touch('doc/stamp-vti') + @classmethod def determine_version(cls, exe): # Output on macOS: -- cgit v1.2.3-70-g09d2