From 8afdaa58056744a556c74dd938a6f66cf2ac28c5 Mon Sep 17 00:00:00 2001 From: healther Date: Thu, 26 Apr 2018 22:19:52 +0200 Subject: add patch to get aspell to build on OSX (#7919) --- var/spack/repos/builtin/packages/aspell/darwin.patch | 20 ++++++++++++++++++++ var/spack/repos/builtin/packages/aspell/package.py | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 var/spack/repos/builtin/packages/aspell/darwin.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/aspell/darwin.patch b/var/spack/repos/builtin/packages/aspell/darwin.patch new file mode 100644 index 0000000000..54ec257637 --- /dev/null +++ b/var/spack/repos/builtin/packages/aspell/darwin.patch @@ -0,0 +1,20 @@ ++++ a/interfaces/cc/aspell.h +--- b/interfaces/cc/aspell.h +@@ -236,7 +236,7 @@ + + /******************************** errors ********************************/ + +- ++#ifndef __cplusplus + extern const struct AspellErrorInfo * const aerror_other; + extern const struct AspellErrorInfo * const aerror_operation_not_supported; + extern const struct AspellErrorInfo * const aerror_cant_copy; +@@ -322,7 +322,7 @@ + extern const struct AspellErrorInfo * const aerror_bad_magic; + extern const struct AspellErrorInfo * const aerror_expression; + extern const struct AspellErrorInfo * const aerror_invalid_expression; +- ++#endif + + /******************************* speller *******************************/ + diff --git a/var/spack/repos/builtin/packages/aspell/package.py b/var/spack/repos/builtin/packages/aspell/package.py index 9038c7d0cf..66eeb9e7cb 100644 --- a/var/spack/repos/builtin/packages/aspell/package.py +++ b/var/spack/repos/builtin/packages/aspell/package.py @@ -40,6 +40,8 @@ class Aspell(AutotoolsPackage): version('0.60.6.1', 'e66a9c9af6a60dc46134fdacf6ce97d7') + patch('darwin.patch', when='platform=darwin') + # The dictionaries install all their bits into their prefix.lib dir, # we want to link them into aspell's dict-dir. # These are identical to what's in spack/package.py except -- cgit v1.2.3-70-g09d2