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 AA35C138350 for ; Fri, 10 Apr 2020 21:33:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4C34E09DD; Fri, 10 Apr 2020 21:33:36 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B1DFCE09DD for ; Fri, 10 Apr 2020 21:33:36 +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 5263434EF78 for ; Fri, 10 Apr 2020 21:33:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BCC212B for ; Fri, 10 Apr 2020 21:33:33 +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: <1586552920.9ff0752e1ee3c28818197eaaca45545708035152.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtcore/qtcore-5.14.9999.ebuild dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild dev-qt/qtcore/qtcore-5.15.9999.ebuild dev-qt/qtcore/qtcore-5.9999.ebuild X-VCS-Directories: dev-qt/qtcore/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9ff0752e1ee3c28818197eaaca45545708035152 X-VCS-Branch: master Date: Fri, 10 Apr 2020 21:33:33 +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: 6c29cdb8-5d8d-435c-a6a2-825a0cd55682 X-Archives-Hash: de7234e0fc686138a33633b4c30e59bc commit: 9ff0752e1ee3c28818197eaaca45545708035152 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Apr 10 17:10:52 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 10 21:08:40 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9ff0752e dev-qt/qtcore: renameat2 is glibc specific We let Qt do the detection and only pass -no-foo when old-kernel is requested. Bug: https://bugs.gentoo.org/669994 Package-Manager: Portage-2.3.98, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtcore/qtcore-5.14.9999.ebuild | 10 ++++++---- dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild | 10 ++++++---- dev-qt/qtcore/qtcore-5.15.9999.ebuild | 10 ++++++---- dev-qt/qtcore/qtcore-5.9999.ebuild | 10 ++++++---- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dev-qt/qtcore/qtcore-5.14.9999.ebuild b/dev-qt/qtcore/qtcore-5.14.9999.ebuild index 14b4d293..8fe97564 100644 --- a/dev-qt/qtcore/qtcore-5.14.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.14.9999.ebuild @@ -50,8 +50,8 @@ pkg_pretend() { use kernel_linux || return get_running_version if kernel_is -lt 3 17 && ! use old-kernel; then - ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}" - ewarn "to function on this kernel properly. See Bug #669994." + ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for" + ewarn "dev-qt/qtcore to function on this kernel properly. See Bug #669994." fi } @@ -70,10 +70,12 @@ src_configure() { -no-feature-statx # bug 672856 $(qt_use icu) $(qt_use !icu iconv) - $(qt_use !old-kernel feature-renameat2) # needs Linux 3.16, bug 669994 - $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, bug 669994 $(qt_use systemd journald) ) + use old-kernel && myconf+=( + -no-feature-renameat2 # needs Linux 3.16, bug 669994 + -no-feature-getentropy # needs Linux 3.17, bug 669994 + ) qt5-build_src_configure } diff --git a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild index 14b4d293..8fe97564 100644 --- a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild @@ -50,8 +50,8 @@ pkg_pretend() { use kernel_linux || return get_running_version if kernel_is -lt 3 17 && ! use old-kernel; then - ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}" - ewarn "to function on this kernel properly. See Bug #669994." + ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for" + ewarn "dev-qt/qtcore to function on this kernel properly. See Bug #669994." fi } @@ -70,10 +70,12 @@ src_configure() { -no-feature-statx # bug 672856 $(qt_use icu) $(qt_use !icu iconv) - $(qt_use !old-kernel feature-renameat2) # needs Linux 3.16, bug 669994 - $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, bug 669994 $(qt_use systemd journald) ) + use old-kernel && myconf+=( + -no-feature-renameat2 # needs Linux 3.16, bug 669994 + -no-feature-getentropy # needs Linux 3.17, bug 669994 + ) qt5-build_src_configure } diff --git a/dev-qt/qtcore/qtcore-5.15.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.9999.ebuild index 14b4d293..8fe97564 100644 --- a/dev-qt/qtcore/qtcore-5.15.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.9999.ebuild @@ -50,8 +50,8 @@ pkg_pretend() { use kernel_linux || return get_running_version if kernel_is -lt 3 17 && ! use old-kernel; then - ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}" - ewarn "to function on this kernel properly. See Bug #669994." + ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for" + ewarn "dev-qt/qtcore to function on this kernel properly. See Bug #669994." fi } @@ -70,10 +70,12 @@ src_configure() { -no-feature-statx # bug 672856 $(qt_use icu) $(qt_use !icu iconv) - $(qt_use !old-kernel feature-renameat2) # needs Linux 3.16, bug 669994 - $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, bug 669994 $(qt_use systemd journald) ) + use old-kernel && myconf+=( + -no-feature-renameat2 # needs Linux 3.16, bug 669994 + -no-feature-getentropy # needs Linux 3.17, bug 669994 + ) qt5-build_src_configure } diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild index fc5723d2..ff1430d7 100644 --- a/dev-qt/qtcore/qtcore-5.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.9999.ebuild @@ -49,8 +49,8 @@ pkg_pretend() { use kernel_linux || return get_running_version if kernel_is -lt 3 17 && ! use old-kernel; then - ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for ${CATEGORY}/${PN}" - ewarn "to function on this kernel properly. See Bug #669994." + ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for" + ewarn "dev-qt/qtcore to function on this kernel properly. See Bug #669994." fi } @@ -69,10 +69,12 @@ src_configure() { -no-feature-statx # bug 672856 $(qt_use icu) $(qt_use !icu iconv) - $(qt_use !old-kernel feature-renameat2) # needs Linux 3.16, bug 669994 - $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, bug 669994 $(qt_use systemd journald) ) + use old-kernel && myconf+=( + -no-feature-renameat2 # needs Linux 3.16, bug 669994 + -no-feature-getentropy # needs Linux 3.17, bug 669994 + ) qt5-build_src_configure }