diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-04-19 18:22:15 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-04-19 18:22:15 +0000 |
| commit | 3e40325482a0c0784cdc893a196e7518f379241d (patch) | |
| tree | 80fb6ad4f26b7f9a93105edb4cfa9eb3e345d6b9 /eclass/qt5-build.eclass | |
| parent | Mask dev-ruby/json_pure for removal. (diff) | |
| download | historical-3e40325482a0c0784cdc893a196e7518f379241d.tar.gz historical-3e40325482a0c0784cdc893a196e7518f379241d.tar.bz2 historical-3e40325482a0c0784cdc893a196e7518f379241d.zip | |
Sync with qt overlay - export AR and OBJDUMP too, use new configure option '-no-libproxy' beginning with Qt 5.5, and update gtkstyle comment.
Diffstat (limited to 'eclass/qt5-build.eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 32263637d604..7d6570ad65aa 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.15 2015/04/01 18:45:04 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.16 2015/04/19 18:22:15 kensington Exp $ # @ECLASS: qt5-build.eclass # @MAINTAINER: @@ -469,7 +469,7 @@ qt5_symlink_tools_to_build_dir() { # Runs ./configure for modules belonging to qtbase. qt5_base_configure() { # setup toolchain variables used by configure - tc-export CC CXX RANLIB STRIP + tc-export AR CC CXX OBJDUMP RANLIB STRIP export LD="$(tc-getCXX)" # configure arguments @@ -534,6 +534,7 @@ qt5_base_configure() { -no-libpng -no-libjpeg -no-freetype -no-harfbuzz -no-openssl + $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libproxy) -no-xinput2 -no-xcb-xlib # always enable glib event loop support @@ -542,8 +543,8 @@ qt5_base_configure() { # disable everything to prevent automagic deps (part 2) -no-pulseaudio -no-alsa - # disable gtkstyle because it adds qt4 include paths to the compiler - # command line if x11-libs/cairo is built with USE=qt4 (bug 433826) + # override in qtgui and qtwidgets where x11-libs/cairo[qt4] is blocked + # to avoid adding qt4 include paths (bug 433826) -no-gtkstyle # exclude examples and tests from default build |