summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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.patch30
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
11SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ 11SRC_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
15SRC_URI[md5sum] = "117c4bc5613c57e1b97d760a5d1910a4" 16SRC_URI[md5sum] = "0fb6b003423e004d94e0119c2390078f"
16SRC_URI[sha256sum] = "cc2702dec21ba5b01144865163f6d1a54268d2b72aafc5520ad0e0cb57104068" 17SRC_URI[sha256sum] = "73d05a689105eb9b8be54f32498c99ddbd360776fc61cf45be6a2a4eb4a40039"
17 18
18DEPENDS = "guile-native libtool-native libxml2-native" 19DEPENDS = "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 @@
1Upstream-Status: Pending
2
3mk-tpl-config.sh: force exit value to be 0 in subprocess
4
5The return value of statement list=`<subcommands>` is the exit value of the
6subcommands. So if the subcommands fails, the compilation fails. This is obviously
7not intended. In the normal case, we expect the grep command to fail as there should
8be no 'noreturn' word in the libguile files.
9
10Signed-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
15diff --git a/autoopts/mk-tpl-config.sh b/autoopts/mk-tpl-config.sh
16index 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--
291.7.9.5
30