From 84052c30c7e4b845543c9704945170a55734343e Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 6 Jun 2014 16:22:28 +0800 Subject: [PATCH] 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. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- ...ive_5.18.2.bb => autogen-native_5.18.3.bb} | 7 +++-- ...-force-exit-value-to-be-0-in-subproc.patch | 30 +++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) rename meta/recipes-devtools/autogen/{autogen-native_5.18.2.bb => autogen-native_5.18.3.bb} (80%) create mode 100644 meta/recipes-devtools/autogen/autogen/mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.3.bb similarity index 80% rename from meta/recipes-devtools/autogen/autogen-native_5.18.2.bb rename to 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" SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ file://guile.patch \ - file://increase-timeout-limit.patch" + file://increase-timeout-limit.patch \ + file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch" -SRC_URI[md5sum] = "117c4bc5613c57e1b97d760a5d1910a4" -SRC_URI[sha256sum] = "cc2702dec21ba5b01144865163f6d1a54268d2b72aafc5520ad0e0cb57104068" +SRC_URI[md5sum] = "0fb6b003423e004d94e0119c2390078f" +SRC_URI[sha256sum] = "73d05a689105eb9b8be54f32498c99ddbd360776fc61cf45be6a2a4eb4a40039" DEPENDS = "guile-native libtool-native libxml2-native" 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 @@ +Upstream-Status: Pending + +mk-tpl-config.sh: force exit value to be 0 in subprocess + +The return value of statement list=`` is the exit value of the +subcommands. So if the subcommands fails, the compilation fails. This is obviously +not intended. In the normal case, we expect the grep command to fail as there should +be no 'noreturn' word in the libguile files. + +Signed-off-by: Chen Qi +--- + autoopts/mk-tpl-config.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/autoopts/mk-tpl-config.sh b/autoopts/mk-tpl-config.sh +index 926f5ab..6b4a0fb 100755 +--- a/autoopts/mk-tpl-config.sh ++++ b/autoopts/mk-tpl-config.sh +@@ -202,7 +202,7 @@ fix_guile() { + + list=`set +e ; exec 2>/dev/null + find ${libguiledir}/libguile* -type f | \ +- xargs grep -l -E '\'` ++ xargs grep -l -E '\' ; exit 0` + + test -z "$list" && exit 0 + +-- +1.7.9.5 + -- 2.40.1