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: Thu, 27 Sep 2012 22:23:57
Message-Id: 1348784530.e51c0943e8c4a170c42aeda1f8869b3120bc2bb8.pesa@gentoo
1 commit: e51c0943e8c4a170c42aeda1f8869b3120bc2bb8
2 Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
3 AuthorDate: Thu Sep 27 22:22:10 2012 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 27 22:22:10 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e51c0943
7
8 [qt5-build.eclass] Use recently-introduced '-no-strip' configure option.
9
10 ---
11 eclass/qt5-build.eclass | 8 +++++---
12 1 files changed, 5 insertions(+), 3 deletions(-)
13
14 diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
15 index 9b75d5a..f0eda4a 100644
16 --- a/eclass/qt5-build.eclass
17 +++ b/eclass/qt5-build.eclass
18 @@ -223,7 +223,6 @@ qt5-build_src_configure() {
19 einfo "Running qmake"
20 ./bin/qmake -recursive \
21 "${S}"/${EGIT_PROJECT}.pro \
22 - CONFIG+=nostrip \
23 QMAKE_LIBDIR+="${QT5_BUILD_DIR}/lib" \
24 QMAKE_LIBDIR+="${QTLIBDIR}" \
25 || die "qmake failed"
26 @@ -401,7 +400,7 @@ qt5_base_configure() {
27 -system-zlib
28 -system-pcre
29
30 - # exclude examples and tests from being built
31 + # exclude examples and tests from default build
32 -nomake examples
33 -nomake tests
34
35 @@ -411,6 +410,9 @@ qt5_base_configure() {
36 # verbosity of the configure and build phases
37 -verbose $(${QT5_VERBOSE_BUILD} || echo -silent)
38
39 + # don't strip
40 + -no-strip
41 +
42 # precompiled headers don't work on hardened, where the flag is masked
43 $(qt_use pch)
44
45 @@ -430,7 +432,7 @@ qt5_base_configure() {
46 # TODO: fix properly in qt-widgets
47 -no-gtkstyle
48
49 - # package-specific options
50 + # module-specific options
51 "${myconf[@]}"
52 )