CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

geos: use std::isnan to support gcc6

Browse Source 
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit 87fc6bb639)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Derek Straka 2016-06-08 14:19:37 -04:00 committed by Armin Kuster
parent e89f1ac0ea
commit d6a50958c4
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch Normal file
View File

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

3
meta-oe/recipes-navigation/geos/geos_3.4.2.bb
View File

@ -1,6 +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"