From: Davide Pesavento <pesa@gentoo.org>
Date: Mon, 7 Jan 2019 20:47:42 +0000 (+0100)
Subject: qt5-build.eclass: move the 's/optimize_full//' sed where it belongs
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=86a67cf32927d6528ebc3926e900910cdb598bef;p=gentoo.git

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

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

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index c6c08a6bd03e..d0a73287222e 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