summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Deaton <jdeaton@users.noreply.github.com>2019-11-07 10:43:59 -0500
committerAdam J. Stewart <ajstewart426@gmail.com>2019-11-07 09:43:59 -0600
commitd748df73a3891640e18020ddb0c3024e01136a2c (patch)
treec15e8c46867dc53df00d3a2c4ea2c00305e2fef2
parent45eecbdbc2d895e6374447142161a6071f828651 (diff)
downloadspack-d748df73a3891640e18020ddb0c3024e01136a2c.tar.gz
spack-d748df73a3891640e18020ddb0c3024e01136a2c.tar.bz2
spack-d748df73a3891640e18020ddb0c3024e01136a2c.tar.xz
spack-d748df73a3891640e18020ddb0c3024e01136a2c.zip
m4: fixed macOS version identification on patch (#13623)
Patch was not being applied in recent versions of macOS. Homebrew is still applying patch to any version after High Sierra.
-rw-r--r--var/spack/repos/builtin/packages/m4/package.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/m4/package.py b/var/spack/repos/builtin/packages/m4/package.py
index 7b440e845e..b0717c2ba0 100644
--- a/var/spack/repos/builtin/packages/m4/package.py
+++ b/var/spack/repos/builtin/packages/m4/package.py
@@ -19,7 +19,9 @@ class M4(AutotoolsPackage):
patch('pgi.patch', when='@1.4.17')
# from: https://github.com/Homebrew/homebrew-core/blob/master/Formula/m4.rb
# Patch credit to Jeremy Huddleston Sequoia <jeremyhu@apple.com>
- patch('secure_snprintf.patch', when='platform_os = highsierra')
+ patch('secure_snprintf.patch', when='os = highsierra')
+ patch('secure_snprintf.patch', when='os = mojave')
+ patch('secure_snprintf.patch', when='os = catalina')
# 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')