From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1DB3A1395E2 for ; Wed, 7 Dec 2016 10:27:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4157EE0D88; Wed, 7 Dec 2016 10:27:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 1D1B6E0D88 for ; Wed, 7 Dec 2016 10:27:02 +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 51449341063 for ; Wed, 7 Dec 2016 10:27:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1CB4F4A9 for ; Wed, 7 Dec 2016 10:27:00 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1481106409.241a0712deb4e10edaa70f6681490a97d49d5126.kensington@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: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 241a0712deb4e10edaa70f6681490a97d49d5126 X-VCS-Branch: master Date: Wed, 7 Dec 2016 10:27:00 +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: 44ff1d4d-f7bf-4d17-a590-792de0a28eb0 X-Archives-Hash: e1a094410a764afd825ee9537daf48b2 commit: 241a0712deb4e10edaa70f6681490a97d49d5126 Author: Michael Palimaka gentoo org> AuthorDate: Thu Dec 1 18:02:53 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Dec 7 10:26:49 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=241a0712 qt5-build.eclass: fix avoiding qmake recompilation for Qt 5.8 and later See qtbase commit 4ce0beee1b69a8695fc24a244a8a3053711906ac. eclass/qt5-build.eclass | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 301cc17..f97bd77 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -179,8 +179,14 @@ qt5-build_src_prepare() { qt5_symlink_tools_to_build_dir # Avoid unnecessary qmake recompilations - sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \ - configure || die "sed failed (skip qmake bootstrap)" + if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then + sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \ + -e '/echo "Done."/a fi' \ + configure || die "sed failed (skip qmake bootstrap)" + else + sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \ + configure || die "sed failed (skip qmake bootstrap)" + fi # Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \