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: Wed, 27 Aug 2014 00:40:54
Message-Id: 1409099924.0f5a20be5e440c1ba6fe49b1f2fc9a457ec28a99.pesa@gentoo
1 commit: 0f5a20be5e440c1ba6fe49b1f2fc9a457ec28a99
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 27 00:38:44 2014 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 27 00:38:44 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0f5a20be
7
8 [qt5-build.eclass] Address comments from mgorny and hasufell during review.
9
10 ---
11 eclass/qt5-build.eclass | 11 +++++++----
12 1 file changed, 7 insertions(+), 4 deletions(-)
13
14 diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
15 index 6602383..18218df 100644
16 --- a/eclass/qt5-build.eclass
17 +++ b/eclass/qt5-build.eclass
18 @@ -186,8 +186,8 @@ qt5-build_src_prepare() {
19 configure || die "sed failed (QMAKE_CONF_COMPILER)"
20
21 # Respect toolchain and flags in config.tests
22 - find config.tests/unix -name '*.test' -type f -print0 \
23 - | xargs -0 sed -i -e '/bin\/qmake/ s/-nocache //' \
24 + find config.tests/unix -name '*.test' -type f \
25 + -execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \
26 || die "sed failed (config.tests)"
27 fi
28
29 @@ -258,8 +258,11 @@ qt5-build_src_install() {
30
31 if [[ ${PN} == qtcore ]]; then
32 pushd "${QT5_BUILD_DIR}" >/dev/null || die
33 - einfo "Running emake INSTALL_ROOT=${D} install_{mkspecs,qmake,syncqt}"
34 - emake INSTALL_ROOT="${D}" install_{mkspecs,qmake,syncqt}
35 +
36 + set -- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake,syncqt}
37 + einfo "Running $*"
38 + "$@"
39 +
40 popd >/dev/null || die
41
42 # install an empty Gentoo/gentoo-qconfig.h in ${D}