mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-04-02 02:49:12 +00:00
geos: Upgrade 3.4.2 -> 3.4.3
Remove patch applied upstream. The change in COPYING is due to updated FSF postal address. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
c1c8895609
commit
847babb25e
@ -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)
|
||||
@ -3,7 +3,7 @@ HOMEPAGE = "http://trac.osgeo.org/geos/"
|
||||
SECTION = "libs"
|
||||
|
||||
LICENSE = "LGPLv2.1+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
SRC_URI = "http://download.osgeo.org/geos/geos-${PV}.tar.bz2"
|
||||
|
||||
|
||||
@ -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"
|
||||
7
meta-oe/recipes-navigation/geos/geos_3.4.3.bb
Normal file
7
meta-oe/recipes-navigation/geos/geos_3.4.3.bb
Normal file
@ -0,0 +1,7 @@
|
||||
require geos.inc
|
||||
|
||||
SRC_URI += "file://geos-config-Add-includedir-variable.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "77f2c2cca1e9f49bc1bece9037ac7a7a"
|
||||
SRC_URI[sha256sum] = "cfbf68079117c1c2b76411636444ff41d73c31093c4cab9dcc9a8c1bbe7e3897"
|
||||
Loading…
x
Reference in New Issue
Block a user