diff options
| author | Jean-Paul Pelteret <jppelteret@gmail.com> | 2017-04-12 14:43:14 +0200 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-04-12 07:43:14 -0500 |
| commit | 0af57ce345f6688badb85d6bd210ddffdac2c200 (patch) | |
| tree | b945e112aaa1784717e08e1243a4dc24c5070673 /var | |
| parent | 7203a3c0556d408623df8fc6aef114d1f1d9ce91 (diff) | |
| download | spack-0af57ce345f6688badb85d6bd210ddffdac2c200.tar.gz spack-0af57ce345f6688badb85d6bd210ddffdac2c200.tar.bz2 spack-0af57ce345f6688badb85d6bd210ddffdac2c200.tar.xz spack-0af57ce345f6688badb85d6bd210ddffdac2c200.zip | |
Apply a patch to allow valgrind 3.12 to build on MacOS >= 10.11 (#3808)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/valgrind/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/valgrind/valgrind_3_12_0_osx.patch | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/valgrind/package.py b/var/spack/repos/builtin/packages/valgrind/package.py index b84c95fb8a..ccc5c74a59 100644 --- a/var/spack/repos/builtin/packages/valgrind/package.py +++ b/var/spack/repos/builtin/packages/valgrind/package.py @@ -58,6 +58,10 @@ class Valgrind(AutotoolsPackage): depends_on("automake", type='build', when='@develop') depends_on("libtool", type='build', when='@develop') + # Apply the patch suggested here: + # http://valgrind.10908.n7.nabble.com/Unable-to-compile-on-Mac-OS-X-10-11-td57237.html + patch('valgrind_3_12_0_osx.patch', when='@3.12.0 platform=darwin') + def configure_args(self): spec = self.spec options = [] diff --git a/var/spack/repos/builtin/packages/valgrind/valgrind_3_12_0_osx.patch b/var/spack/repos/builtin/packages/valgrind/valgrind_3_12_0_osx.patch new file mode 100644 index 0000000000..109cbc31f7 --- /dev/null +++ b/var/spack/repos/builtin/packages/valgrind/valgrind_3_12_0_osx.patch @@ -0,0 +1,13 @@ +diff --git a/coregrind/m_main.c b/coregrind/m_main.c +index d008ab3..42d8f30 100644 +--- a/coregrind/m_main.c ++++ b/coregrind/m_main.c +@@ -4058,7 +4058,7 @@ UWord voucher_mach_msg_set ( UWord arg1 ) + + #endif + +-#if defined(VGO_darwin) && DARWIN_VERS == DARWIN_10_10 ++#if defined(VGO_darwin) + + /* This might also be needed for > DARWIN_10_10, but I have no way + to test for that. Hence '==' rather than '>=' in the version |