summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-06-04 15:56:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-11 13:49:52 +0100
commitabcc43634a089b67626c02662a7a3a3d54f0b8a7 (patch)
treef8d5b1eba2702736751e566ac96af01e49e571bf
parent2215a9671787af1343299a50c80ed2e0ab1bc0b2 (diff)
downloadpoky-abcc43634a089b67626c02662a7a3a3d54f0b8a7.tar.gz
poky-abcc43634a089b67626c02662a7a3a3d54f0b8a7.tar.bz2
poky-abcc43634a089b67626c02662a7a3a3d54f0b8a7.zip
augeas: Fix compilation failure
on uclibc we see this failure too few arguments to function 'escape' (From OE-Core rev: 4ea9c79cdcf0ffdc833b7a63e7a2b8388d6bf6e6) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/augeas/augeas.inc4
-rw-r--r--meta/recipes-extended/augeas/augeas/0001-Add-missing-argument-to-escape.patch29
-rw-r--r--meta/recipes-extended/augeas/augeas_0.10.0.bb2
3 files changed, 33 insertions, 2 deletions
diff --git a/meta/recipes-extended/augeas/augeas.inc b/meta/recipes-extended/augeas/augeas.inc
index 9fe864d27d..479fb97cc4 100644
--- a/meta/recipes-extended/augeas/augeas.inc
+++ b/meta/recipes-extended/augeas/augeas.inc
@@ -5,7 +5,9 @@ BUGTRACKER = "https://fedorahosted.org/augeas/report/1"
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff"
-SRC_URI = "http://augeas.net/download/${BP}.tar.gz"
+SRC_URI = "http://augeas.net/download/${BP}.tar.gz \
+ file://0001-Add-missing-argument-to-escape.patch \
+ "
DEPENDS = "readline libxml2"
diff --git a/meta/recipes-extended/augeas/augeas/0001-Add-missing-argument-to-escape.patch b/meta/recipes-extended/augeas/augeas/0001-Add-missing-argument-to-escape.patch
new file mode 100644
index 0000000000..3d0d0e3726
--- /dev/null
+++ b/meta/recipes-extended/augeas/augeas/0001-Add-missing-argument-to-escape.patch
@@ -0,0 +1,29 @@
+Upstream-Status: Backport
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+From 021ea39f8e400225e2d01b4c62eb9d56404f2ecd Mon Sep 17 00:00:00 2001
+From: Michael Chapman <mike@very.puzzling.org>
+Date: Fri, 16 Dec 2011 21:30:07 +1100
+Subject: [PATCH] Add missing argument to escape()
+
+Fixes ticket #242.
+---
+ src/regexp.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/regexp.c b/src/regexp.c
+index cf0ea5d..811087d 100644
+--- a/src/regexp.c
++++ b/src/regexp.c
+@@ -50,7 +50,7 @@ char *regexp_escape(const struct regexp *r) {
+ ret = fa_restrict_alphabet(r->pattern->str, strlen(r->pattern->str),
+ &nre, &nre_len, 2, 1);
+ if (ret == 0) {
+- pat = escape(nre, nre_len);
++ pat = escape(nre, nre_len, RX_ESCAPES);
+ free(nre);
+ }
+ #endif
+--
+1.7.5.4
+
diff --git a/meta/recipes-extended/augeas/augeas_0.10.0.bb b/meta/recipes-extended/augeas/augeas_0.10.0.bb
index 00921aa854..1a087070aa 100644
--- a/meta/recipes-extended/augeas/augeas_0.10.0.bb
+++ b/meta/recipes-extended/augeas/augeas_0.10.0.bb
@@ -1,6 +1,6 @@
require augeas.inc
-PR = "r1"
+PR = "r2"
SRC_URI[md5sum] = "fe1834e90a066c3208ac0214622c7352"
SRC_URI[sha256sum] = "ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca"