From 92c2c47f720d75c12e0bc1a30b92522e82770d58 Mon Sep 17 00:00:00 2001
From: t-karatsu <49965247+t-karatsu@users.noreply.github.com>
Date: Thu, 19 Dec 2019 08:10:05 +0900
Subject: aspell: Rename 'darwin.patch' and apply it to all targets. (#14206)

---
 var/spack/repos/builtin/packages/aspell/darwin.patch | 20 --------------------
 .../repos/builtin/packages/aspell/fix_cpp.patch      | 20 ++++++++++++++++++++
 var/spack/repos/builtin/packages/aspell/package.py   |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 var/spack/repos/builtin/packages/aspell/darwin.patch
 create mode 100644 var/spack/repos/builtin/packages/aspell/fix_cpp.patch

diff --git a/var/spack/repos/builtin/packages/aspell/darwin.patch b/var/spack/repos/builtin/packages/aspell/darwin.patch
deleted file mode 100644
index 54ec257637..0000000000
--- a/var/spack/repos/builtin/packages/aspell/darwin.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-+++ 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/fix_cpp.patch b/var/spack/repos/builtin/packages/aspell/fix_cpp.patch
new file mode 100644
index 0000000000..54ec257637
--- /dev/null
+++ b/var/spack/repos/builtin/packages/aspell/fix_cpp.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 84a3f0ec71..f485cf9851 100644
--- a/var/spack/repos/builtin/packages/aspell/package.py
+++ b/var/spack/repos/builtin/packages/aspell/package.py
@@ -18,5 +18,5 @@ class Aspell(AutotoolsPackage):
 
     version('0.60.6.1', sha256='f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1')
 
-    patch('darwin.patch', when='platform=darwin')
+    patch('fix_cpp.patch')
     patch('issue-519.patch', when='@:0.60.6.1')
-- 
cgit v1.2.3-60-g2f50