diff options
| author | George Hartzell <hartzell@alerce.com> | 2018-12-31 14:13:03 -0800 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-12-31 16:13:03 -0600 |
| commit | fb52eb2a185f8675a2b9ce77902f9ba899977520 (patch) | |
| tree | 94d11750043d7deeb5fd0e1a39da9ab780615b46 /var | |
| parent | 51fbd315e9869868c5c10891442e0aba2229ea09 (diff) | |
| download | spack-fb52eb2a185f8675a2b9ce77902f9ba899977520.tar.gz spack-fb52eb2a185f8675a2b9ce77902f9ba899977520.tar.bz2 spack-fb52eb2a185f8675a2b9ce77902f9ba899977520.tar.xz spack-fb52eb2a185f8675a2b9ce77902f9ba899977520.zip | |
aspell builds with newer gcc's (#10227)
Apply fix from aspell issue (519) for a pointer dereference bug that
newer versions of gcc won't let slip past.
There hasn't been a release that includes the fix, this applies the
change to the latest release.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/aspell/issue-519.patch | 37 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/aspell/package.py | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/aspell/issue-519.patch b/var/spack/repos/builtin/packages/aspell/issue-519.patch new file mode 100644 index 0000000000..61ffabba06 --- /dev/null +++ b/var/spack/repos/builtin/packages/aspell/issue-519.patch @@ -0,0 +1,37 @@ +From 8089fa02122fed0a6394eba14bbedcb1d18e2384 Mon Sep 17 00:00:00 2001 +From: Kevin Atkinson <kevina@gnu.org> +Date: Thu, 29 Dec 2016 00:50:31 -0500 +Subject: [PATCH] Compile Fixes for GCC 7. + +Closes #519. +--- + modules/filter/tex.cpp | 2 +- + prog/check_funs.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/filter/tex.cpp b/modules/filter/tex.cpp +index a979539..19ab63c 100644 +--- a/modules/filter/tex.cpp ++++ b/modules/filter/tex.cpp +@@ -174,7 +174,7 @@ namespace { + + if (c == '{') { + +- if (top.in_what == Parm || top.in_what == Opt || top.do_check == '\0') ++ if (top.in_what == Parm || top.in_what == Opt || *top.do_check == '\0') + push_command(Parm); + + top.in_what = Parm; +diff --git a/prog/check_funs.cpp b/prog/check_funs.cpp +index db54f3d..89ee09d 100644 +--- a/prog/check_funs.cpp ++++ b/prog/check_funs.cpp +@@ -647,7 +647,7 @@ static void print_truncate(FILE * out, const char * word, int width) { + } + } + if (i == width-1) { +- if (word == '\0') ++ if (*word == '\0') + put(out,' '); + else if (word[len] == '\0') + put(out, word, len); diff --git a/var/spack/repos/builtin/packages/aspell/package.py b/var/spack/repos/builtin/packages/aspell/package.py index 5dbe7ed301..c23c48dc43 100644 --- a/var/spack/repos/builtin/packages/aspell/package.py +++ b/var/spack/repos/builtin/packages/aspell/package.py @@ -19,3 +19,4 @@ class Aspell(AutotoolsPackage): version('0.60.6.1', 'e66a9c9af6a60dc46134fdacf6ce97d7') patch('darwin.patch', when='platform=darwin') + patch('issue-519.patch', when='@:0.60.6.1') |