1 |
commit: f3886df8a10a03548efb3941c84aefc51fb4b195 |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 22 23:07:29 2015 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 22 23:07:29 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f3886df8 |
7 |
|
8 |
qt5-build.eclass: add missing die when using cat with heredocs |
9 |
|
10 |
eclass/qt5-build.eclass | 11 ++++------- |
11 |
1 file changed, 4 insertions(+), 7 deletions(-) |
12 |
|
13 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
14 |
index 4ad6ee0..63c6617 100644 |
15 |
--- a/eclass/qt5-build.eclass |
16 |
+++ b/eclass/qt5-build.eclass |
17 |
@@ -17,12 +17,9 @@ case ${EAPI} in |
18 |
*) die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;; |
19 |
esac |
20 |
|
21 |
+[[ ${EAPI} == 5 ]] && inherit multilib |
22 |
inherit eutils flag-o-matic toolchain-funcs versionator virtualx |
23 |
|
24 |
-if [[ ${EAPI} == 5 ]]; then |
25 |
- inherit multilib |
26 |
-fi |
27 |
- |
28 |
HOMEPAGE="https://www.qt.io/" |
29 |
LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3" |
30 |
|
31 |
@@ -243,12 +240,12 @@ qt5-build_src_test() { |
32 |
# create a custom testrunner script that correctly sets |
33 |
# {,DY}LD_LIBRARY_PATH before executing the given test |
34 |
local testrunner=${QT5_BUILD_DIR}/gentoo-testrunner |
35 |
- cat <<-EOF > "${testrunner}" |
36 |
+ cat > "${testrunner}" <<-_EOF_ || die |
37 |
#!/bin/sh |
38 |
export LD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QT5_LIBDIR}" |
39 |
export DYLD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QT5_LIBDIR}" |
40 |
"\$@" |
41 |
- EOF |
42 |
+ _EOF_ |
43 |
chmod +x "${testrunner}" |
44 |
|
45 |
_qt5_test_runner() { |
46 |
@@ -293,7 +290,7 @@ qt5-build_src_install() { |
47 |
|| die "sed failed (qconfig.h)" |
48 |
|
49 |
# install qtchooser configuration file |
50 |
- cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ |
51 |
+ cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die |
52 |
${QT5_BINDIR} |
53 |
${QT5_LIBDIR} |
54 |
_EOF_ |