kensington 15/04/19 18:22:15 Modified: ChangeLog qt5-build.eclass Log: Sync with qt overlay - export AR and OBJDUMP too, use new configure option '-no-libproxy' beginning with Qt 5.5, and update gtkstyle comment.
Revision Changes Path 1.1590 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1590&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1590&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1589&r2=1.1590 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1589 retrieving revision 1.1590 diff -u -r1.1589 -r1.1590 --- ChangeLog 18 Apr 2015 13:19:47 -0000 1.1589 +++ ChangeLog 19 Apr 2015 18:22:15 -0000 1.1590 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1589 2015/04/18 13:19:47 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1590 2015/04/19 18:22:15 kensington Exp $ + + 19 Apr 2015; Michael Palimaka <[email protected]> qt5-build.eclass: + Sync with qt overlay - export AR and OBJDUMP too, use new configure option + '-no-libproxy' beginning with Qt 5.5, and update gtkstyle comment. 18 Apr 2015; Pacho Ramos <[email protected]> gnome2.eclass: Ban eapi2 and 3 for gnome2.eclass (#539118) 1.16 eclass/qt5-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.15&r2=1.16 Index: qt5-build.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- qt5-build.eclass 1 Apr 2015 18:45:04 -0000 1.15 +++ qt5-build.eclass 19 Apr 2015 18:22:15 -0000 1.16 @@ -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 @@ # 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 @@ -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 @@ # 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
