diff options
| author |   Otavio Salvador <otavio@ossystems.com.br> | 2013-12-16 22:30:58 -0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-12-21 19:26:41 +0100 |
| commit | d74be33220b8161389cb05a8650e328598bbe2ce (patch) | |
| tree | f267a1fec9dcedb51bf774111f2d6465e51d35ec /meta-oe/recipes-navigation/geos/files | |
| parent | 04393f3265221191239109c50827c018119534d6 (diff) | |
| download | meta-openembedded-d74be33220b8161389cb05a8650e328598bbe2ce.tar.gz | |
geos: Update to 3.4.2 and rework the packaging
* This updates to the 3.4.2 release and rework the packaging splitting
the C bindings in another binary package to reduce footprint in
rootfs; this also moves geos-config to the development package as it
should.
* Fix -dev installation and upgrade path
Using 'lib_package' renames the binaries and we need a transitional
package to be used as upgrade path. This is done using an empty 'geos'
package which installs the new ones as runtime dependency.
This same package is used to satisfy -dev dependency of geos package
allowing for its inclusion into SDK.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation/geos/files')
| -rw-r--r-- | meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch b/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch new file mode 100644 index 0000000000..645e6f62a5 --- /dev/null +++ b/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 <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 + |