geos: use std::isnan to support gcc6

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

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 0000000000..5c5fbd1d9a
--- /dev/null
+++ b/meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch
@@ -0,0 +1,22 @@
+--- geos-3.4.2/configure.in.orig        2016-06-08 17:46:43.002250304 +0000
++++ geos-3.4.2/configure.in     2016-06-08 17:57:36.342241606 +0000
+@@ -197,7 +197,7 @@
+ AC_LANG_PUSH([C++])
+ AC_CACHE_CHECK([for isnan], ac_cv_isnan,
+  [AC_TRY_LINK([#include <cmath>],
+- [double x; int y; y = isnan(x);],
++ [double x; int y; y = std::isnan(x);],
+  ac_cv_isnan=yes,
+  ac_cv_isnan=no
+ )])
+--- geos-3.4.2/include/geos/platform.h.in.orig  2016-06-08 14:06:53.910234182 -0400
++++ geos-3.4.2/include/geos/platform.h.in       2016-06-08 14:07:19.298233844 -0400
+@@ -84,7 +84,7 @@
+ #endif
+ 
+ #if defined(HAVE_ISNAN)
+-# define ISNAN(x) (isnan(x))
++# define ISNAN(x) (std::isnan(x))
+ #else
+ # if defined(_MSC_VER)
+ #  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 a0c43f3513..7193f8fb56 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 @@
 require geos.inc
 
-SRC_URI += "file://geos-config-Add-includedir-variable.patch"
+SRC_URI += "file://geos-config-Add-includedir-variable.patch \
+            file://fix-gcc6-isnan.patch"
 
 SRC_URI[md5sum] = "fc5df2d926eb7e67f988a43a92683bae"
 SRC_URI[sha256sum] = "15e8bfdf7e29087a957b56ac543ea9a80321481cef4d4f63a7b268953ad26c53"
-
-# http://errors.yoctoproject.org/Errors/Details/68613/
-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 fff195a0e7..d66dc875be 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"
 SRC_URI[sha256sum] = "9f138a6854740c7827fdee53845eb1485fce3e805a7aa9fc9151f8046ebd312d"
 
 SRC_URI += "file://geos-config.patch"
-
-PNBLACKLIST[libspatialite] ?= "Depends on broken geos"