Apply a patch to allow valgrind 3.12 to build on MacOS >= 10.11 (#3808)

This commit is contained in:
Jean-Paul Pelteret 2017-04-12 14:43:14 +02:00 committed by Adam J. Stewart
parent 7203a3c055
commit 0af57ce345
2 changed files with 17 additions and 0 deletions

View File

@ -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 = []

View File

@ -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