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, 05 Apr 2012 12:51:37
Message-Id: 1333630236.11c7a436ede014604172c04d36853541b5c93a7a.pesa@gentoo
1 commit: 11c7a436ede014604172c04d36853541b5c93a7a
2 Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
3 AuthorDate: Thu Apr 5 12:50:36 2012 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 5 12:50:36 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=11c7a436
7
8 [qt4-r2.eclass] Apply kensington's patch wrt bug 361303.
9
10 ---
11 eclass/qt4-r2.eclass | 15 +++++++++------
12 1 files changed, 9 insertions(+), 6 deletions(-)
13
14 diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
15 index 37d529e..09adfd8 100644
16 --- a/eclass/qt4-r2.eclass
17 +++ b/eclass/qt4-r2.eclass
18 @@ -268,12 +268,15 @@ eqmake4() {
19 QMAKE_CC="$(tc-getCC)" \
20 QMAKE_CXX="$(tc-getCXX)" \
21 QMAKE_LINK="$(tc-getCXX)" \
22 - QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
23 - QMAKE_CFLAGS_DEBUG="${CFLAGS}" \
24 - QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
25 - QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS}" \
26 - QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \
27 - QMAKE_LFLAGS_DEBUG="${LDFLAGS}" \
28 + QMAKE_CFLAGS="${CFLAGS}" \
29 + QMAKE_CFLAGS_RELEASE= \
30 + QMAKE_CFLAGS_DEBUG= \
31 + QMAKE_CXXFLAGS="${CXXFLAGS}" \
32 + QMAKE_CXXFLAGS_RELEASE= \
33 + QMAKE_CXXFLAGS_DEBUG= \
34 + QMAKE_LFLAGS="${LDFLAGS}" \
35 + QMAKE_LFLAGS_RELEASE= \
36 + QMAKE_LFLAGS_DEBUG= \
37 QMAKE_LIBDIR_QT="${EPREFIX}"/usr/$(get_libdir)/qt4 \
38 QMAKE_LIBDIR_X11="${EPREFIX}"/usr/$(get_libdir) \
39 QMAKE_LIBDIR_OPENGL="${EPREFIX}"/usr/$(get_libdir) \