diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-navigation/geos')
4 files changed, 5 insertions, 46 deletions
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 deleted file mode 100644 index 645e6f62a5..0000000000 --- a/meta-openembedded/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9d51027c228dafd7db2d0cffca1f0fc695e950fd Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -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 <otavio@ossystems.com.br> ---- - 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 index bfac69b094..484ca9154f 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc +++ b/meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc @@ -9,6 +9,8 @@ SRC_URI = "http://download.osgeo.org/geos/geos-${PV}.tar.bz2" inherit autotools pkgconfig binconfig +EXTRA_OECONF += "--enable-inline=no" + PACKAGES =+ "geoslib ${PN}-c1" DESCRIPTION:${PN}lib = "Geometry engine for Geographic Information Systems - C++ Library" diff --git a/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.4.3.bb b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.4.3.bb deleted file mode 100644 index 538456cc27..0000000000 --- a/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.4.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require geos.inc - -SRC_URI += "file://geos-config-Add-includedir-variable.patch \ -" - -SRC_URI[md5sum] = "77f2c2cca1e9f49bc1bece9037ac7a7a" -SRC_URI[sha256sum] = "cfbf68079117c1c2b76411636444ff41d73c31093c4cab9dcc9a8c1bbe7e3897" diff --git a/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.3.bb b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.3.bb new file mode 100644 index 0000000000..fdb72204ea --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.3.bb @@ -0,0 +1,3 @@ +require geos.inc + +SRC_URI[sha256sum] = "f8b2314e311456f7a449144efb5e3188c2a28774752bc50fc882a3cd5c89ee35" |