qt5-build.eclass: move the 's/optimize_full//' sed where it belongs
authorDavide Pesavento <pesa@gentoo.org>
Mon, 7 Jan 2019 20:47:42 +0000 (21:47 +0100)
committerAndreas Sturmlechner <asturm@gentoo.org>
Thu, 7 Feb 2019 22:09:08 +0000 (23:09 +0100)
Signed-off-by: Davide Pesavento <pesa@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
eclass/qt5-build.eclass

index c6c08a6bd03e8a70de71c1ff5d281bc23441151e..d0a73287222e1ff55051019744c4dca7b1bd6017 100644 (file)
@@ -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