[gentoo-commits] repo/gentoo:master commit in: eclass/

[Andreas Sturmlechner]

commit:     86a67cf32927d6528ebc3926e900910cdb598bef
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  7 20:47:42 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  7 22:09:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a67cf3

qt5-build.eclass: move the 's/optimize_full//' sed where it belongs

Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index c6c08a6bd03..d0a73287222 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -178,9 +178,11 @@ qt5-build_src_prepare() {
                sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
                        configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
-               # 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)"
+               if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then
+                       # 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)"
+               fi
 
                # Respect build variables in configure tests (bug #639494)
                sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- 
\"\$@\"|& $(qt5_qmake_args) |" configure || die