commit: 0f5a20be5e440c1ba6fe49b1f2fc9a457ec28a99
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 27 00:38:44 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Aug 27 00:38:44 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0f5a20be
[qt5-build.eclass] Address comments from mgorny and hasufell during review.
---
eclass/qt5-build.eclass | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 6602383..18218df 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -186,8 +186,8 @@ qt5-build_src_prepare() {
configure || die "sed failed (QMAKE_CONF_COMPILER)"
# Respect toolchain and flags in config.tests
- find config.tests/unix -name '*.test' -type f -print0 \
- | xargs -0 sed -i -e '/bin\/qmake/ s/-nocache //' \
+ find config.tests/unix -name '*.test' -type f \
+ -execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \
|| die "sed failed (config.tests)"
fi
@@ -258,8 +258,11 @@ qt5-build_src_install() {
if [[ ${PN} == qtcore ]]; then
pushd "${QT5_BUILD_DIR}" >/dev/null || die
- einfo "Running emake INSTALL_ROOT=${D}
install_{mkspecs,qmake,syncqt}"
- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake,syncqt}
+
+ set -- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake,syncqt}
+ einfo "Running $*"
+ "$@"
+
popd >/dev/null || die
# install an empty Gentoo/gentoo-qconfig.h in ${D}