diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2016-06-12 03:11:31 +0200 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2016-06-12 03:11:31 +0200 |
| commit | 17fe09dd3b0f9ef3f4fab5944ef123abd53ea003 (patch) | |
| tree | e89b93aac43d9b7e9253a7157dbf2626de2bc01b /eclass/qt5-build.eclass | |
| parent | app-admin/collectd: Add ~arm keyword (diff) | |
| download | gentoo-17fe09dd3b0f9ef3f4fab5944ef123abd53ea003.tar.gz gentoo-17fe09dd3b0f9ef3f4fab5944ef123abd53ea003.tar.bz2 gentoo-17fe09dd3b0f9ef3f4fab5944ef123abd53ea003.zip | |
qt5-build.eclass: switch to using system proxy settings by default
But only in 5.6 and later, we don't want to touch stable 5.5.1.
Upstream is switching to this new setting in 5.8, see qtbase
commit 6d9f648d0ed591a0afba018adfbb089871f67b38.
Diffstat (limited to 'eclass/qt5-build.eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 349e5513ba01..9b1a4ab23bf6 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -594,9 +594,6 @@ qt5_base_configure() { # print verbose information about each configure test -verbose - # obsolete flag, does nothing - #-nis - # always enable iconv support -iconv @@ -650,8 +647,9 @@ qt5_base_configure() { # disable gstreamer by default, override in qtmultimedia -no-gstreamer - # use upstream default - #-no-system-proxies + # respect system proxies by default: it's the most natural + # setting, and it'll become the new upstream default in 5.8 + $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -system-proxies) # do not build with -Werror -no-warnings-are-errors |