diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-06-06 16:22:28 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-06 10:24:07 +0100 |
commit | 22f422fb9b4db611d09335837489c0a01947ad0e (patch) | |
tree | 444fc0666c5de80a19ce697d58ecd1e7cf64f485 /meta | |
parent | 7c127aad2804b80169825cd17d18e3e494a6e5a2 (diff) | |
download | poky-22f422fb9b4db611d09335837489c0a01947ad0e.tar.gz |
autogen-native: upgrade from 2.18.2 to 2.18.3
Upgrade autogen-native from 2.18.2 to 2.18.3.
A patch is made to fix the compilation error.
(From OE-Core rev: 84052c30c7e4b845543c9704945170a55734343e)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/autogen/autogen-native_5.18.3.bb (renamed from meta/recipes-devtools/autogen/autogen-native_5.18.2.bb) | 7 | ||||
-rw-r--r-- | meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch | 30 |
2 files changed, 34 insertions, 3 deletions
diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.3.bb index 92e7099f20..61bd21fc38 100644 --- a/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb +++ b/meta/recipes-devtools/autogen/autogen-native_5.18.3.bb | |||
@@ -10,10 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | |||
10 | 10 | ||
11 | SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ | 11 | SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ |
12 | file://guile.patch \ | 12 | file://guile.patch \ |
13 | file://increase-timeout-limit.patch" | 13 | file://increase-timeout-limit.patch \ |
14 | file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch" | ||
14 | 15 | ||
15 | SRC_URI[md5sum] = "117c4bc5613c57e1b97d760a5d1910a4" | 16 | SRC_URI[md5sum] = "0fb6b003423e004d94e0119c2390078f" |
16 | SRC_URI[sha256sum] = "cc2702dec21ba5b01144865163f6d1a54268d2b72aafc5520ad0e0cb57104068" | 17 | SRC_URI[sha256sum] = "73d05a689105eb9b8be54f32498c99ddbd360776fc61cf45be6a2a4eb4a40039" |
17 | 18 | ||
18 | DEPENDS = "guile-native libtool-native libxml2-native" | 19 | DEPENDS = "guile-native libtool-native libxml2-native" |
19 | 20 | ||
diff --git a/meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch b/meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch new file mode 100644 index 0000000000..e56da7b1da --- /dev/null +++ b/meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | mk-tpl-config.sh: force exit value to be 0 in subprocess | ||
4 | |||
5 | The return value of statement list=`<subcommands>` is the exit value of the | ||
6 | subcommands. So if the subcommands fails, the compilation fails. This is obviously | ||
7 | not intended. In the normal case, we expect the grep command to fail as there should | ||
8 | be no 'noreturn' word in the libguile files. | ||
9 | |||
10 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
11 | --- | ||
12 | autoopts/mk-tpl-config.sh | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/autoopts/mk-tpl-config.sh b/autoopts/mk-tpl-config.sh | ||
16 | index 926f5ab..6b4a0fb 100755 | ||
17 | --- a/autoopts/mk-tpl-config.sh | ||
18 | +++ b/autoopts/mk-tpl-config.sh | ||
19 | @@ -202,7 +202,7 @@ fix_guile() { | ||
20 | |||
21 | list=`set +e ; exec 2>/dev/null | ||
22 | find ${libguiledir}/libguile* -type f | \ | ||
23 | - xargs grep -l -E '\<noreturn\>'` | ||
24 | + xargs grep -l -E '\<noreturn\>' ; exit 0` | ||
25 | |||
26 | test -z "$list" && exit 0 | ||
27 | |||
28 | -- | ||
29 | 1.7.9.5 | ||
30 | |||