From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0DAD459CAF for ; Thu, 7 Apr 2016 16:23:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9257B21C040; Thu, 7 Apr 2016 16:23:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 262F221C040 for ; Thu, 7 Apr 2016 16:23:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 49C14340DBB for ; Thu, 7 Apr 2016 16:23:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F4EACA for ; Thu, 7 Apr 2016 16:23:12 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1460046165.19e67f928a60a88953d6b85443e630367cedf46a.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 19e67f928a60a88953d6b85443e630367cedf46a X-VCS-Branch: master Date: Thu, 7 Apr 2016 16:23:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3b6d8d24-1b7b-48e6-bfff-08a75efe08df X-Archives-Hash: f97920b801b91d7d30095958d7cd9a43 commit: 19e67f928a60a88953d6b85443e630367cedf46a Author: Davide Pesavento gentoo org> AuthorDate: Thu Apr 7 16:22:45 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Thu Apr 7 16:22:45 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=19e67f92 qt5-build.eclass: drop 5.4 support eclass/qt5-build.eclass | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index b073497..ba3f5bf 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -201,16 +201,14 @@ qt5-build_src_prepare() { find config.tests/unix -name '*.test' -type f -execdir \ sed -i -re '/(bin\/qmake|QMAKE")/ s/-nocache //' '{}' + || die + # Don't inject -msse/-mavx/... into CXXFLAGS when detecting + # compiler support for extended instruction sets (bug 552942) + find config.tests/common -name '*.pro' -type f -execdir \ + sed -i -e '/QMAKE_CXXFLAGS\s*+=/ d' '{}' + || 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 '/QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die - fi fi if [[ ${EAPI} == 5 ]]; then @@ -552,14 +550,7 @@ qt5_base_configure() { # obsolete flag, does nothing #-qml-debug - # 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) + # MIPS DSP instruction set extensions $(is-flagq -mno-dsp && echo -no-mips_dsp) $(is-flagq -mno-dspr2 && echo -no-mips_dspr2) @@ -576,9 +567,8 @@ qt5_base_configure() { $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-syslog) -no-libpng -no-libjpeg -no-freetype -no-harfbuzz - -no-openssl - $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libproxy) - $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-xkbcommon-{x11,evdev}) + -no-openssl -no-libproxy + -no-xkbcommon-x11 -no-xkbcommon-evdev -no-xinput2 -no-xcb-xlib # don't specify -no-gif because there is no way to override it later @@ -609,10 +599,7 @@ qt5_base_configure() { -iconv # disable everything to prevent automagic deps (part 3) - -no-cups -no-evdev - $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-tslib) - -no-icu -no-fontconfig - -no-dbus + -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus # let portage handle stripping -no-strip @@ -657,10 +644,10 @@ qt5_base_configure() { -no-opengl -no-egl # disable libinput-based generic plugin by default, override in qtgui - $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libinput) + -no-libinput # disable gstreamer by default, override in qtmultimedia - $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-gstreamer) + -no-gstreamer # use upstream default #-no-system-proxies