Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
Date: Sat, 26 Jul 2014 12:43:29
Message-Id: 1406378378.dc15981d63addb5cf8e7c942fec6590f018a32f8.pesa@gentoo
1 commit: dc15981d63addb5cf8e7c942fec6590f018a32f8
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 26 12:39:38 2014 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 26 12:39:38 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=dc15981d
7
8 [qt5-build.eclass] Return proper exit status from qt5_foreach_target_subdir.
9
10 Fix/workaround for bug 517976.
11
12 ---
13 eclass/qt5-build.eclass | 5 ++++-
14 1 file changed, 4 insertions(+), 1 deletion(-)
15
16 diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
17 index 00456df..28b82d9 100644
18 --- a/eclass/qt5-build.eclass
19 +++ b/eclass/qt5-build.eclass
20 @@ -411,7 +411,7 @@ qt5_prepare_env() {
21 qt5_foreach_target_subdir() {
22 [[ -z ${QT5_TARGET_SUBDIRS[@]} ]] && QT5_TARGET_SUBDIRS=("")
23
24 - local subdir
25 + local ret=0 subdir=
26 for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
27 if [[ ${EBUILD_PHASE} == test ]]; then
28 subdir=tests/auto${subdir#src}
29 @@ -423,9 +423,12 @@ qt5_foreach_target_subdir() {
30
31 einfo "Running $* ${subdir:+in ${subdir}}"
32 "$@"
33 + ((ret+=$?))
34
35 popd >/dev/null || die
36 done
37 +
38 + return ${ret}
39 }
40
41 # @FUNCTION: qt5_symlink_tools_to_build_dir