diff options
author | Derek Straka <derek@asterius.io> | 2016-06-08 14:19:37 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-06-15 12:13:15 +0200 |
commit | 87fc6bb63978e95839c1efeb072d851f6ee3c907 (patch) | |
tree | 5041586563498415959644c2583afe36628f4e04 /meta-oe/recipes-navigation | |
parent | aebac658d52f358b79be8cc1100fb5719c576091 (diff) | |
download | meta-openembedded-87fc6bb63978e95839c1efeb072d851f6ee3c907.tar.gz |
geos: use std::isnan to support gcc6
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation')
3 files changed, 24 insertions, 6 deletions
diff --git a/meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch b/meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch new file mode 100644 index 000000000..5c5fbd1d9 --- /dev/null +++ b/meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | --- geos-3.4.2/configure.in.orig 2016-06-08 17:46:43.002250304 +0000 | ||
2 | +++ geos-3.4.2/configure.in 2016-06-08 17:57:36.342241606 +0000 | ||
3 | @@ -197,7 +197,7 @@ | ||
4 | AC_LANG_PUSH([C++]) | ||
5 | AC_CACHE_CHECK([for isnan], ac_cv_isnan, | ||
6 | [AC_TRY_LINK([#include <cmath>], | ||
7 | - [double x; int y; y = isnan(x);], | ||
8 | + [double x; int y; y = std::isnan(x);], | ||
9 | ac_cv_isnan=yes, | ||
10 | ac_cv_isnan=no | ||
11 | )]) | ||
12 | --- geos-3.4.2/include/geos/platform.h.in.orig 2016-06-08 14:06:53.910234182 -0400 | ||
13 | +++ geos-3.4.2/include/geos/platform.h.in 2016-06-08 14:07:19.298233844 -0400 | ||
14 | @@ -84,7 +84,7 @@ | ||
15 | #endif | ||
16 | |||
17 | #if defined(HAVE_ISNAN) | ||
18 | -# define ISNAN(x) (isnan(x)) | ||
19 | +# define ISNAN(x) (std::isnan(x)) | ||
20 | #else | ||
21 | # if defined(_MSC_VER) | ||
22 | # define ISNAN(x) _isnan(x) | ||
diff --git a/meta-oe/recipes-navigation/geos/geos_3.4.2.bb b/meta-oe/recipes-navigation/geos/geos_3.4.2.bb index a0c43f351..7193f8fb5 100644 --- a/meta-oe/recipes-navigation/geos/geos_3.4.2.bb +++ b/meta-oe/recipes-navigation/geos/geos_3.4.2.bb | |||
@@ -1,9 +1,7 @@ | |||
1 | require geos.inc | 1 | require geos.inc |
2 | 2 | ||
3 | SRC_URI += "file://geos-config-Add-includedir-variable.patch" | 3 | SRC_URI += "file://geos-config-Add-includedir-variable.patch \ |
4 | file://fix-gcc6-isnan.patch" | ||
4 | 5 | ||
5 | SRC_URI[md5sum] = "fc5df2d926eb7e67f988a43a92683bae" | 6 | SRC_URI[md5sum] = "fc5df2d926eb7e67f988a43a92683bae" |
6 | SRC_URI[sha256sum] = "15e8bfdf7e29087a957b56ac543ea9a80321481cef4d4f63a7b268953ad26c53" | 7 | SRC_URI[sha256sum] = "15e8bfdf7e29087a957b56ac543ea9a80321481cef4d4f63a7b268953ad26c53" |
7 | |||
8 | # http://errors.yoctoproject.org/Errors/Details/68613/ | ||
9 | PNBLACKLIST[geos] ?= "BROKEN: fails to build with gcc-6" | ||
diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite_4.2.0.bb b/meta-oe/recipes-navigation/libspatialite/libspatialite_4.2.0.bb index fff195a0e..d66dc875b 100644 --- a/meta-oe/recipes-navigation/libspatialite/libspatialite_4.2.0.bb +++ b/meta-oe/recipes-navigation/libspatialite/libspatialite_4.2.0.bb | |||
@@ -21,5 +21,3 @@ SRC_URI[md5sum] = "83305ed694a77152120d1f74c5151779" | |||
21 | SRC_URI[sha256sum] = "9f138a6854740c7827fdee53845eb1485fce3e805a7aa9fc9151f8046ebd312d" | 21 | SRC_URI[sha256sum] = "9f138a6854740c7827fdee53845eb1485fce3e805a7aa9fc9151f8046ebd312d" |
22 | 22 | ||
23 | SRC_URI += "file://geos-config.patch" | 23 | SRC_URI += "file://geos-config.patch" |
24 | |||
25 | PNBLACKLIST[libspatialite] ?= "Depends on broken geos" | ||