From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../geos/files/fix-gcc6-isnan.patch | 22 ++++++++++++ .../geos-config-Add-includedir-variable.patch | 39 ++++++++++++++++++++++ .../meta-oe/recipes-navigation/geos/geos.inc | 21 ++++++++++++ .../meta-oe/recipes-navigation/geos/geos_3.4.2.bb | 7 ++++ 4 files changed, 89 insertions(+) create mode 100644 meta-openembedded/meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch create mode 100644 meta-openembedded/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch create mode 100644 meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc create mode 100644 meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.4.2.bb (limited to 'meta-openembedded/meta-oe/recipes-navigation/geos') diff --git a/meta-openembedded/meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch b/meta-openembedded/meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch new file mode 100644 index 0000000000..5c5fbd1d9a --- /dev/null +++ b/meta-openembedded/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 ], +- [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-openembedded/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch b/meta-openembedded/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch new file mode 100644 index 0000000000..645e6f62a5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch @@ -0,0 +1,39 @@ +From 9d51027c228dafd7db2d0cffca1f0fc695e950fd Mon Sep 17 00:00:00 2001 +From: Otavio Salvador +Date: Mon, 2 Dec 2013 11:33:26 -0200 +Subject: [PATCH] geos-config: Add includedir variable + +This fixes cross-compile as it is easier to mangle the includedir +during sysroot generation. + +Upstream-Status: Pending + +Signed-off-by: Otavio Salvador +--- + tools/geos-config.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/geos-config.in b/tools/geos-config.in +index 9b45b5f..1749892 100644 +--- a/tools/geos-config.in ++++ b/tools/geos-config.in +@@ -1,6 +1,7 @@ + #!/bin/sh + prefix=@prefix@ + exec_prefix=@exec_prefix@ ++includedir=@includedir@ + libdir=@libdir@ + + usage() +@@ -38,7 +39,7 @@ case $1 in + echo @VERSION@ + ;; + --cflags) +- echo -I${prefix}/include ++ echo -I${includedir} + ;; + --libs) + # TODO: make an alias for --clibs +-- +1.7.10.4 + diff --git a/meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc b/meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc new file mode 100644 index 0000000000..2e308b4882 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc @@ -0,0 +1,21 @@ +DESCRIPTION = "GEOS - Geometry Engine, Open Source" +HOMEPAGE = "http://trac.osgeo.org/geos/" +SECTION = "libs" + +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI = "http://download.osgeo.org/geos/geos-${PV}.tar.bz2" + +inherit autotools pkgconfig binconfig + +PACKAGES =+ "geoslib ${PN}-c1" + +DESCRIPTION_${PN}lib = "Geometry engine for Geographic Information Systems - C++ Library" +FILES_${PN}lib += "${libdir}/libgeos-${PV}.so" + +DESCRIPTION_${PN}-c1 = "Geometry engine for Geographic Information Systems - C Library" +FILES_${PN}-c1 += "${libdir}/libgeos_c.so.*" + +ALLOW_EMPTY_${PN} = "1" +RDEPENDS_${PN} += "geoslib ${PN}-c1" diff --git a/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.4.2.bb b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.4.2.bb new file mode 100644 index 0000000000..7193f8fb56 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.4.2.bb @@ -0,0 +1,7 @@ +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" -- cgit v1.2.3