diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-06-04 15:56:43 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-11 13:49:52 +0100 |
commit | abcc43634a089b67626c02662a7a3a3d54f0b8a7 (patch) | |
tree | f8d5b1eba2702736751e566ac96af01e49e571bf /meta | |
parent | 2215a9671787af1343299a50c80ed2e0ab1bc0b2 (diff) | |
download | poky-abcc43634a089b67626c02662a7a3a3d54f0b8a7.tar.gz |
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/augeas/augeas.inc | 4 | ||||
-rw-r--r-- | meta/recipes-extended/augeas/augeas/0001-Add-missing-argument-to-escape.patch | 29 | ||||
-rw-r--r-- | meta/recipes-extended/augeas/augeas_0.10.0.bb | 2 |
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" | |||
5 | LICENSE = "LGPLv2.1+" | 5 | LICENSE = "LGPLv2.1+" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff" |
7 | 7 | ||
8 | SRC_URI = "http://augeas.net/download/${BP}.tar.gz" | 8 | SRC_URI = "http://augeas.net/download/${BP}.tar.gz \ |
9 | file://0001-Add-missing-argument-to-escape.patch \ | ||
10 | " | ||
9 | 11 | ||
10 | DEPENDS = "readline libxml2" | 12 | DEPENDS = "readline libxml2" |
11 | 13 | ||
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 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
3 | |||
4 | From 021ea39f8e400225e2d01b4c62eb9d56404f2ecd Mon Sep 17 00:00:00 2001 | ||
5 | From: Michael Chapman <mike@very.puzzling.org> | ||
6 | Date: Fri, 16 Dec 2011 21:30:07 +1100 | ||
7 | Subject: [PATCH] Add missing argument to escape() | ||
8 | |||
9 | Fixes ticket #242. | ||
10 | --- | ||
11 | src/regexp.c | 2 +- | ||
12 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
13 | |||
14 | diff --git a/src/regexp.c b/src/regexp.c | ||
15 | index cf0ea5d..811087d 100644 | ||
16 | --- a/src/regexp.c | ||
17 | +++ b/src/regexp.c | ||
18 | @@ -50,7 +50,7 @@ char *regexp_escape(const struct regexp *r) { | ||
19 | ret = fa_restrict_alphabet(r->pattern->str, strlen(r->pattern->str), | ||
20 | &nre, &nre_len, 2, 1); | ||
21 | if (ret == 0) { | ||
22 | - pat = escape(nre, nre_len); | ||
23 | + pat = escape(nre, nre_len, RX_ESCAPES); | ||
24 | free(nre); | ||
25 | } | ||
26 | #endif | ||
27 | -- | ||
28 | 1.7.5.4 | ||
29 | |||
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 @@ | |||
1 | require augeas.inc | 1 | require augeas.inc |
2 | 2 | ||
3 | PR = "r1" | 3 | PR = "r2" |
4 | 4 | ||
5 | SRC_URI[md5sum] = "fe1834e90a066c3208ac0214622c7352" | 5 | SRC_URI[md5sum] = "fe1834e90a066c3208ac0214622c7352" |
6 | SRC_URI[sha256sum] = "ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca" | 6 | SRC_URI[sha256sum] = "ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca" |