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 Aug 2015 22:35:43
Message-Id: 1440714885.942576847685e455639de9c2f6f431d42ee83445.pesa@gentoo
1 commit: 942576847685e455639de9c2f6f431d42ee83445
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 27 22:34:45 2015 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 27 22:34:45 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=94257684
7
8 qt5-build.eclass: disable configure options that are new in 5.6
9
10 Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
11
12 eclass/qt5-build.eclass | 4 +++-
13 1 file changed, 3 insertions(+), 1 deletion(-)
14
15 diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
16 index b274cf6..0359315 100644
17 --- a/eclass/qt5-build.eclass
18 +++ b/eclass/qt5-build.eclass
19 @@ -546,6 +546,7 @@ qt5_base_configure() {
20 # disable everything to prevent automagic deps (part 1)
21 -no-mtdev
22 -no-journald
23 + $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-syslog)
24 -no-libpng -no-libjpeg
25 -no-freetype -no-harfbuzz
26 -no-openssl
27 @@ -608,7 +609,8 @@ qt5_base_configure() {
28 #-use-gold-linker
29
30 # disable all platform plugins by default, override in qtgui
31 - -no-xcb -no-eglfs -no-directfb -no-linuxfb -no-kms
32 + -no-xcb -no-eglfs -no-kms -no-directfb -no-linuxfb
33 + $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-mirclient)
34
35 # disable undocumented X11-related flags, override in qtgui
36 # (not shown in ./configure -help output)