[gentoo-commits] proj/qt:master commit in: eclass/

[Davide Pesavento]

commit:     ecd44b7ea14e4b92d8de94058987b1cd3e52f9ce
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 21:35:30 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 21:35:30 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=ecd44b7e

qt5-build.eclass: sync with gentoo repo

 eclass/qt5-build.eclass | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 9f8eabb..c5eb32b 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -58,8 +58,6 @@ QT5_MINOR_VERSION=$(get_version_component_range 2)
 readonly QT5_MINOR_VERSION
 
 if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
-       # IMPORTANT: add a subslot dependency to your package only if you are 
sure
-       #            that it uses some private Qt APIs (most likely it does not)
        SLOT=5/$(get_version_component_range 1-2)
 else
        SLOT=5
@@ -196,13 +194,19 @@ qt5-build_src_prepare() {
                        configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
                # Respect toolchain and flags in config.tests
-               find config.tests/unix -name '*.test' -type f \
-                       -execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \
-                       || die "sed failed (config.tests)"
+               find config.tests/unix -name '*.test' -type f -execdir \
+                       sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + || die
 
                # Don't add -O3 to CXXFLAGS (bug 549140)
                sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
                        src/{corelib/corelib,gui/gui}.pro || die "sed failed 
(optimize_full)"
+
+               # Don't inject -msse/-mavx/... into CXXFLAGS when detecting
+               # compiler support for extended instruction sets (bug 552942)
+               if [[ ${QT5_MINOR_VERSION} -ge 5 ]]; then
+                       find config.tests/common -name '*.pro' -type f -execdir 
\
+                               sed -i -e '/else:QMAKE_CXXFLAGS\s*+=/ d' '{}' + 
|| die
+               fi
        fi
 
        if [[ ${EAPI} == 5 ]]; then
@@ -536,16 +540,16 @@ qt5_base_configure() {
                # obsolete flag, does nothing
                #-qml-debug
 
-               # instruction set support
-               $(is-flagq -mno-sse2    && echo -no-sse2)
-               $(is-flagq -mno-sse3    && echo -no-sse3)
-               $(is-flagq -mno-ssse3   && echo -no-ssse3)
-               $(is-flagq -mno-sse4.1  && echo -no-sse4.1)
-               $(is-flagq -mno-sse4.2  && echo -no-sse4.2)
-               $(is-flagq -mno-avx     && echo -no-avx)
-               $(is-flagq -mno-avx2    && echo -no-avx2)
-               $(is-flagq -mno-dsp     && echo -no-mips_dsp)
-               $(is-flagq -mno-dspr2   && echo -no-mips_dspr2)
+               # extended instruction sets support
+               $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse2   && 
echo -no-sse2)
+               $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse3   && 
echo -no-sse3)
+               $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-ssse3  && 
echo -no-ssse3)
+               $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse4.1 && 
echo -no-sse4.1)
+               $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse4.2 && 
echo -no-sse4.2)
+               $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-avx    && 
echo -no-avx)
+               $([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-avx2   && 
echo -no-avx2)
+               $(is-flagq -mno-dsp   && echo -no-mips_dsp)
+               $(is-flagq -mno-dspr2 && echo -no-mips_dspr2)
 
                # use pkg-config to detect include and library paths
                -pkg-config