* [gentoo-commits] proj/qt:master commit in: eclass/
@ 2012-06-29 23:09 99% Davide Pesavento
0 siblings, 0 replies; 1+ results
From: Davide Pesavento @ 2012-06-29 23:09 UTC (permalink / raw
To: gentoo-commits
commit: 04411b50c835c313756e72d550d2008cce2bdf78
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Jun 29 23:01:22 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 23:01:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=04411b50
[qt5-build.eclass] Restore the recursive qmake invocation.
The qmake invocation has to be recursive, otherwise <module>.pri files
are not correctly generated for all modules.
However, in order to avoid pre-stripped files, we now pass -dont-process
to configure and execute a single recursive qmake call by ourselves,
starting from the top-level directory.
---
eclass/qt5-build.eclass | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 10ce73a..cf5df3a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -178,10 +178,6 @@ qt5-build_src_prepare() {
'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
configure || die "sed configure failed"
- # Don't run qmake at the end of configure
- sed -i -e '/echo "Creating makefiles\./,+2 d' \
- configure || die "sed configure failed"
-
# Respect CXX in configure
sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
configure || die "sed QMAKE_CONF_COMPILER failed"
@@ -235,7 +231,7 @@ qt5-build_src_configure() {
# general configure options
-shared
- -fast
+ -dont-process
-pkg-config
-system-zlib
-system-pcre
@@ -261,24 +257,18 @@ qt5-build_src_configure() {
"${myconf[@]}"
)
- pushd "${QT5_BUILD_DIR}" >/dev/null || die
+ pushd "${QT5_BUILD_DIR}" > /dev/null || die
einfo "Configuring with: ${conf[@]}"
"${S}"/configure "${conf[@]}" || die "configure failed"
- einfo "Running qmake on top-level project file"
- ./bin/qmake "${S}"/qtbase.pro CONFIG+=nostrip || die
-
- popd >/dev/null || die
+ einfo "Running qmake"
+ ./bin/qmake -recursive "${S}"/qtbase.pro \
+ QMAKE_LIBDIR="${QTLIBDIR}" \
+ CONFIG+=nostrip \
+ || die "qmake failed"
- qmake() {
- "${QT5_BUILD_DIR}"/bin/qmake \
- "${S}/${subdir}/${subdir##*/}.pro" \
- QMAKE_LIBDIR_QT="${QTLIBDIR}" \
- CONFIG+=nostrip \
- || die
- }
- qt5_foreach_target_subdir qmake
+ popd > /dev/null || die
}
# @FUNCTION: qt5-build_src_compile
@@ -304,9 +294,9 @@ qt5-build_src_install() {
qt5_foreach_target_subdir emake INSTALL_ROOT="${D}" install
if [[ ${PN} == "qt-core" ]]; then
- pushd "${QT5_BUILD_DIR}" >/dev/null || die
+ pushd "${QT5_BUILD_DIR}" > /dev/null || die
emake INSTALL_ROOT="${D}" install_{qmake,mkspecs}
- popd >/dev/null || die
+ popd > /dev/null || die
# create an empty Gentoo/gentoo-qconfig.h
dodir "${QTHEADERDIR#${EPREFIX}}"/Gentoo
@@ -398,10 +388,10 @@ qt5_foreach_target_subdir() {
local subdir
for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die
- pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die
+ pushd "${QT5_BUILD_DIR}/${subdir}" > /dev/null || die
einfo "Running $* in ${subdir}"
"$@"
- popd >/dev/null || die
+ popd > /dev/null || die
done
}
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2012-06-29 23:09 99% [gentoo-commits] proj/qt:master commit in: eclass/ Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox