diff options
3 files changed, 3 insertions, 46 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 deleted file mode 100644 index 645e6f62a5..0000000000 --- a/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | From 9d51027c228dafd7db2d0cffca1f0fc695e950fd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
| 3 | Date: Mon, 2 Dec 2013 11:33:26 -0200 | ||
| 4 | Subject: [PATCH] geos-config: Add includedir variable | ||
| 5 | |||
| 6 | This fixes cross-compile as it is easier to mangle the includedir | ||
| 7 | during sysroot generation. | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | |||
| 11 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
| 12 | --- | ||
| 13 | tools/geos-config.in | 3 ++- | ||
| 14 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/tools/geos-config.in b/tools/geos-config.in | ||
| 17 | index 9b45b5f..1749892 100644 | ||
| 18 | --- a/tools/geos-config.in | ||
| 19 | +++ b/tools/geos-config.in | ||
| 20 | @@ -1,6 +1,7 @@ | ||
| 21 | #!/bin/sh | ||
| 22 | prefix=@prefix@ | ||
| 23 | exec_prefix=@exec_prefix@ | ||
| 24 | +includedir=@includedir@ | ||
| 25 | libdir=@libdir@ | ||
| 26 | |||
| 27 | usage() | ||
| 28 | @@ -38,7 +39,7 @@ case $1 in | ||
| 29 | echo @VERSION@ | ||
| 30 | ;; | ||
| 31 | --cflags) | ||
| 32 | - echo -I${prefix}/include | ||
| 33 | + echo -I${includedir} | ||
| 34 | ;; | ||
| 35 | --libs) | ||
| 36 | # TODO: make an alias for --clibs | ||
| 37 | -- | ||
| 38 | 1.7.10.4 | ||
| 39 | |||
diff --git a/meta-oe/recipes-navigation/geos/geos_3.4.3.bb b/meta-oe/recipes-navigation/geos/geos_3.4.3.bb deleted file mode 100644 index 538456cc27..0000000000 --- a/meta-oe/recipes-navigation/geos/geos_3.4.3.bb +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | require geos.inc | ||
| 2 | |||
| 3 | SRC_URI += "file://geos-config-Add-includedir-variable.patch \ | ||
| 4 | " | ||
| 5 | |||
| 6 | SRC_URI[md5sum] = "77f2c2cca1e9f49bc1bece9037ac7a7a" | ||
| 7 | SRC_URI[sha256sum] = "cfbf68079117c1c2b76411636444ff41d73c31093c4cab9dcc9a8c1bbe7e3897" | ||
diff --git a/meta-oe/recipes-navigation/geos/geos_3.9.3.bb b/meta-oe/recipes-navigation/geos/geos_3.9.3.bb new file mode 100644 index 0000000000..fdb72204ea --- /dev/null +++ b/meta-oe/recipes-navigation/geos/geos_3.9.3.bb | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | require geos.inc | ||
| 2 | |||
| 3 | SRC_URI[sha256sum] = "f8b2314e311456f7a449144efb5e3188c2a28774752bc50fc882a3cd5c89ee35" | ||
