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 589DE138334 for ; Thu, 6 Dec 2018 20:49:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58EEEE07D4; Thu, 6 Dec 2018 20:49:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 24273E07D4 for ; Thu, 6 Dec 2018 20:49:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0AC38335C6F for ; Thu, 6 Dec 2018 20:49:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A1E554CB for ; Thu, 6 Dec 2018 20:49:01 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1544125759.4f4cce366061b571324e5f17ac4697b6e26379c4.asturm@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: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 4f4cce366061b571324e5f17ac4697b6e26379c4 X-VCS-Branch: master Date: Thu, 6 Dec 2018 20:49:01 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 71f9c570-bb05-4903-9c69-a20cdb8e6409 X-Archives-Hash: 4df0bd89b458d2190c4b170677fba903 commit: 4f4cce366061b571324e5f17ac4697b6e26379c4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 3 17:49:16 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Dec 6 19:49:19 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4f4cce36 qt5-build.eclass: Cleanup quirks for no longer available versions Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 70f2bed9..3189f0c0 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -174,14 +174,8 @@ qt5-build_src_prepare() { qt5_symlink_tools_to_build_dir # Avoid unnecessary qmake recompilations - 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 + sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \ + -e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)" # Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \ @@ -196,12 +190,6 @@ qt5-build_src_prepare() { sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ configure || die "sed failed (QMAKE_CONF_COMPILER)" - if [[ ${QT5_MINOR_VERSION} -le 7 ]]; then - # Respect toolchain and flags in config.tests - find config.tests/unix -name '*.test' -type f -execdir \ - sed -i -e 's/-nocache //' '{}' + || die - fi - # 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 \ @@ -579,9 +567,6 @@ qt5_base_configure() { # build shared libraries -shared - # always enable large file support - $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -largefile) - # disabling accessibility is not recommended by upstream, as # it will break QStyle and may break other internal parts of Qt -accessibility @@ -624,7 +609,6 @@ qt5_base_configure() { # disable everything to prevent automagic deps (part 2) -no-gtk - $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-pulseaudio -no-alsa) # exclude examples and tests from default build -nomake examples @@ -637,10 +621,6 @@ qt5_base_configure() { # print verbose information about each configure test -verbose - # always enable iconv support - # since 5.8 this is handled in qtcore - $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv) - # disable everything to prevent automagic deps (part 3) -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus @@ -667,10 +647,6 @@ qt5_base_configure() { # disable undocumented X11-related flags, override in qtgui # (not shown in ./configure -help output) -no-xkb - $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-xrender) - - # disable obsolete/unused X11-related flags - $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-mitshm -no-xcursor -no-xfixes -no-xrandr -no-xshape -no-xsync) # always enable session management support: it doesn't need extra deps # at configure time and turning it off is dangerous, see bug 518262 @@ -686,9 +662,6 @@ qt5_base_configure() { # disable libinput-based generic plugin by default, override in qtgui -no-libinput - # disable gstreamer by default, override in qtmultimedia - $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-gstreamer) - # respect system proxies by default: it's the most natural # setting, and it'll become the new upstream default in 5.8 -system-proxies