geos: Upgrade 3.4.2 -> 3.4.3
PATCH 1/1 geos: Upgrade 3.4.2 -> 3.4.3
Remove patch applied upstream.
Signed-off-by Adrian Bunk <[email protected]>
--- .../geos/files/fix-gcc6-isnan.patch | 22 ------------------- meta-oe/recipes-navigation/geos/geos_3.4.2.bb | 7 ------ meta-oe/recipes-navigation/geos/geos_3.4.3.bb | 7 ++++++ 3 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch delete mode 100644 meta-oe/recipes-navigation/geos/geos_3.4.2.bb create mode 100644 meta-oe/recipes-navigation/geos/geos_3.4.3.bb
meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch deleted +0 -22
@@ -1,22 +0,0 @@ ---- 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)
meta-oe/recipes-navigation/geos/geos_3.4.2.bb deleted +0 -7
@@ -1,7 +0,0 @@ -require geos.inc - -SRC_URI += "file://geos-config-Add-includedir-variable.patch \ - file://fix-gcc6-isnan.patch" - -SRC_URI[md5sum] = "fc5df2d926eb7e67f988a43a92683bae" -SRC_URI[sha256sum] = "15e8bfdf7e29087a957b56ac543ea9a80321481cef4d4f63a7b268953ad26c53"
meta-oe/recipes-navigation/geos/geos_3.4.3.bb new file +7 -0
@@ -0,0 +1,7 @@ +require geos.inc + +SRC_URI += "file://geos-config-Add-includedir-variable.patch \ +" + +SRC_URI[md5sum] = "77f2c2cca1e9f49bc1bece9037ac7a7a" +SRC_URI[sha256sum] = "cfbf68079117c1c2b76411636444ff41d73c31093c4cab9dcc9a8c1bbe7e3897"
Signature · 1 line
2.17.1
Quoted 2 lines · Adrian Bunk
Remove patch applied upstream.
I am also seeing license checksum mismatches
https://errors.yoctoproject.org/Errors/Details/240048/
Quoted 65 lines
Signed-off-by Adrian Bunk <[email protected]>--- .../geos/files/fix-gcc6-isnan.patch | 22 ------------------- meta-oe/recipes-navigation/geos/geos_3.4.2.bb | 7 ------ meta-oe/recipes-navigation/geos/geos_3.4.3.bb | 7 ++++++ 3 files changed, 7 insertions(+), 29 deletions(-)delete mode 100644
meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patchdelete mode 100644 meta-oe/recipes-navigation/geos/geos_3.4.2.bb create mode 100644 meta-oe/recipes-navigation/geos/geos_3.4.3.bbmeta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch deleted +0
-22@@ -1,22 +0,0 @@ ---- 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)meta-oe/recipes-navigation/geos/geos_3.4.2.bb deleted +0
-7@@ -1,7 +0,0 @@ -require geos.inc - -SRC_URI += "file://geos-config-Add-includedir-variable.patch \ - file://fix-gcc6-isnan.patch" - -SRC_URI[md5sum] = "fc5df2d926eb7e67f988a43a92683bae" -SRC_URI[sha256sum] = "15e8bfdf7e29087a957b56ac543ea9a80321481cef4d4f63a7b268953ad26c53"meta-oe/recipes-navigation/geos/geos_3.4.3.bb new file +7
-0@@ -0,0 +1,7 @@ +require geos.inc + +SRC_URI += "file://geos-config-Add-includedir-variable.patch \ +" + +SRC_URI[md5sum] = "77f2c2cca1e9f49bc1bece9037ac7a7a" +SRC_URI[sha256sum] = "cfbf68079117c1c2b76411636444ff41d73c31093c4cab9dcc9a8c1bbe7e3897"
Quoted 8 lines · Khem Raj
Quoted 2 lines · Adrian Bunk
Remove patch applied upstream.
I am also seeing license checksum mismatches
...
Sorry for that (and I am still puzzled what went I botched so that I didn't notice).
v2 sent for both.
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed