1 |
commit: 04411b50c835c313756e72d550d2008cce2bdf78 |
2 |
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Jun 29 23:01:22 2012 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 29 23:01:22 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=04411b50 |
7 |
|
8 |
[qt5-build.eclass] Restore the recursive qmake invocation. |
9 |
|
10 |
The qmake invocation has to be recursive, otherwise <module>.pri files |
11 |
are not correctly generated for all modules. |
12 |
|
13 |
However, in order to avoid pre-stripped files, we now pass -dont-process |
14 |
to configure and execute a single recursive qmake call by ourselves, |
15 |
starting from the top-level directory. |
16 |
|
17 |
--- |
18 |
eclass/qt5-build.eclass | 34 ++++++++++++---------------------- |
19 |
1 files changed, 12 insertions(+), 22 deletions(-) |
20 |
|
21 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
22 |
index 10ce73a..cf5df3a 100644 |
23 |
--- a/eclass/qt5-build.eclass |
24 |
+++ b/eclass/qt5-build.eclass |
25 |
@@ -178,10 +178,6 @@ qt5-build_src_prepare() { |
26 |
'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \ |
27 |
configure || die "sed configure failed" |
28 |
|
29 |
- # Don't run qmake at the end of configure |
30 |
- sed -i -e '/echo "Creating makefiles\./,+2 d' \ |
31 |
- configure || die "sed configure failed" |
32 |
- |
33 |
# Respect CXX in configure |
34 |
sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ |
35 |
configure || die "sed QMAKE_CONF_COMPILER failed" |
36 |
@@ -235,7 +231,7 @@ qt5-build_src_configure() { |
37 |
|
38 |
# general configure options |
39 |
-shared |
40 |
- -fast |
41 |
+ -dont-process |
42 |
-pkg-config |
43 |
-system-zlib |
44 |
-system-pcre |
45 |
@@ -261,24 +257,18 @@ qt5-build_src_configure() { |
46 |
"${myconf[@]}" |
47 |
) |
48 |
|
49 |
- pushd "${QT5_BUILD_DIR}" >/dev/null || die |
50 |
+ pushd "${QT5_BUILD_DIR}" > /dev/null || die |
51 |
|
52 |
einfo "Configuring with: ${conf[@]}" |
53 |
"${S}"/configure "${conf[@]}" || die "configure failed" |
54 |
|
55 |
- einfo "Running qmake on top-level project file" |
56 |
- ./bin/qmake "${S}"/qtbase.pro CONFIG+=nostrip || die |
57 |
- |
58 |
- popd >/dev/null || die |
59 |
+ einfo "Running qmake" |
60 |
+ ./bin/qmake -recursive "${S}"/qtbase.pro \ |
61 |
+ QMAKE_LIBDIR="${QTLIBDIR}" \ |
62 |
+ CONFIG+=nostrip \ |
63 |
+ || die "qmake failed" |
64 |
|
65 |
- qmake() { |
66 |
- "${QT5_BUILD_DIR}"/bin/qmake \ |
67 |
- "${S}/${subdir}/${subdir##*/}.pro" \ |
68 |
- QMAKE_LIBDIR_QT="${QTLIBDIR}" \ |
69 |
- CONFIG+=nostrip \ |
70 |
- || die |
71 |
- } |
72 |
- qt5_foreach_target_subdir qmake |
73 |
+ popd > /dev/null || die |
74 |
} |
75 |
|
76 |
# @FUNCTION: qt5-build_src_compile |
77 |
@@ -304,9 +294,9 @@ qt5-build_src_install() { |
78 |
qt5_foreach_target_subdir emake INSTALL_ROOT="${D}" install |
79 |
|
80 |
if [[ ${PN} == "qt-core" ]]; then |
81 |
- pushd "${QT5_BUILD_DIR}" >/dev/null || die |
82 |
+ pushd "${QT5_BUILD_DIR}" > /dev/null || die |
83 |
emake INSTALL_ROOT="${D}" install_{qmake,mkspecs} |
84 |
- popd >/dev/null || die |
85 |
+ popd > /dev/null || die |
86 |
|
87 |
# create an empty Gentoo/gentoo-qconfig.h |
88 |
dodir "${QTHEADERDIR#${EPREFIX}}"/Gentoo |
89 |
@@ -398,10 +388,10 @@ qt5_foreach_target_subdir() { |
90 |
local subdir |
91 |
for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do |
92 |
mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die |
93 |
- pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die |
94 |
+ pushd "${QT5_BUILD_DIR}/${subdir}" > /dev/null || die |
95 |
einfo "Running $* in ${subdir}" |
96 |
"$@" |
97 |
- popd >/dev/null || die |
98 |
+ popd > /dev/null || die |
99 |
done |
100 |
} |