From 7602fcd4d0965fbdf34baa8b3ee69a9db8955074 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 26 May 2018 10:36:34 -0500 Subject: Fix compilation of FYBA with GCC 6 (#8273) --- var/spack/repos/builtin/packages/fyba/gcc-6.patch | 18 ++++++++++++++++++ var/spack/repos/builtin/packages/fyba/package.py | 4 ++++ 2 files changed, 22 insertions(+) create mode 100644 var/spack/repos/builtin/packages/fyba/gcc-6.patch (limited to 'var') 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 + #include + #include + ++#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') -- cgit v1.2.3-70-g09d2