diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2018-05-26 10:36:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-26 10:36:34 -0500 |
| commit | 7602fcd4d0965fbdf34baa8b3ee69a9db8955074 (patch) | |
| tree | fd079fda64713b1299c8c6ea2f03d9c63e2d43fe /var | |
| parent | 8203c4f55b5a411a7864ddeca62f9331d66e77fb (diff) | |
| download | spack-7602fcd4d0965fbdf34baa8b3ee69a9db8955074.tar.gz spack-7602fcd4d0965fbdf34baa8b3ee69a9db8955074.tar.bz2 spack-7602fcd4d0965fbdf34baa8b3ee69a9db8955074.tar.xz spack-7602fcd4d0965fbdf34baa8b3ee69a9db8955074.zip | |
Fix compilation of FYBA with GCC 6 (#8273)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/fyba/gcc-6.patch | 18 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/fyba/package.py | 4 |
2 files changed, 22 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/fyba/gcc-6.patch b/var/spack/repos/builtin/packages/fyba/gcc-6.patch new file mode 100644 index 0000000000..33551d6546 --- /dev/null +++ b/var/spack/repos/builtin/packages/fyba/gcc-6.patch @@ -0,0 +1,18 @@ +diff -Nuar a/src/FYBA/FYLU.cpp b/src/FYBA/FYLU.cpp +--- a/src/FYBA/FYLU.cpp 2014-09-22 00:36:49.000000000 -0500 ++++ b/src/FYBA/FYLU.cpp 2018-05-24 15:35:43.584181379 -0500 +@@ -4,12 +4,12 @@ + /* Innhold: Rutiner for utvalg */
+ /* ======================================================================== */
+
+-#include "stdafx.h"
+-
+ #include <ctype.h>
+ #include <math.h>
+ #include <locale>
+
++#include "stdafx.h"
++
+ using namespace std;
+
+ #define U_PARA_LEN 128 /* Max lengde av parameterstreng */
diff --git a/var/spack/repos/builtin/packages/fyba/package.py b/var/spack/repos/builtin/packages/fyba/package.py index 914de4aef4..bdaece0cf5 100644 --- a/var/spack/repos/builtin/packages/fyba/package.py +++ b/var/spack/repos/builtin/packages/fyba/package.py @@ -43,6 +43,10 @@ class Fyba(AutotoolsPackage): depends_on('libtool', type='build') depends_on('m4', type='build') + # error: macro "min" passed 3 arguments, but takes just 2 + # https://github.com/kartverket/fyba/issues/21 + patch('gcc-6.patch') + # fatal error: 'sys/vfs.h' file not found # https://github.com/kartverket/fyba/issues/12 patch('vfs-mount-darwin.patch', when='platform=darwin') |