summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/m4/inline-pgi.patch12
-rw-r--r--var/spack/repos/builtin/packages/m4/package.py4
2 files changed, 16 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/m4/inline-pgi.patch b/var/spack/repos/builtin/packages/m4/inline-pgi.patch
index da5eb57a93..bc31ad918e 100644
--- a/var/spack/repos/builtin/packages/m4/inline-pgi.patch
+++ b/var/spack/repos/builtin/packages/m4/inline-pgi.patch
@@ -8,3 +8,15 @@
&& !(defined __SUNPRO_C && __STDC__))) \
&& !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
# define _GL_INLINE inline
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,7 @@
+ [bug-m4@gnu.org])
+ AC_CONFIG_AUX_DIR([build-aux])
+
+-AM_INIT_AUTOMAKE([1.11.6 dist-bzip2 dist-xz color-tests parallel-tests
++AM_INIT_AUTOMAKE([dist-bzip2 dist-xz color-tests parallel-tests
+ silent-rules subdir-objects gnu])
+
+ m4_pattern_forbid([^M4_[A-Z]])
+
diff --git a/var/spack/repos/builtin/packages/m4/package.py b/var/spack/repos/builtin/packages/m4/package.py
index ef70add18a..aa0c775f08 100644
--- a/var/spack/repos/builtin/packages/m4/package.py
+++ b/var/spack/repos/builtin/packages/m4/package.py
@@ -14,6 +14,10 @@ class M4(Package):
depends_on('libsigsegv', when='+sigsegv')
def install(self, spec, prefix):
+ # After patch, update generated configuration files that depend on extern-inline.m4
+ autoreconf = which('autoreconf')
+ autoreconf()
+
configure_args = []
if 'libsigsegv' in spec:
configure_args.append('--with-libsigsegv-prefix=%s' % spec['libsigsegv'].prefix)