Fix compilation of FYBA with GCC 6 (#8273)

This commit is contained in:
Adam J. Stewart 2018-05-26 10:36:34 -05:00 committed by GitHub
parent 8203c4f55b
commit 7602fcd4d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions

View File

@ -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 */

View File

@ -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')