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 7A490138239 for ; Sun, 12 Apr 2020 18:09:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6382E08BD; Sun, 12 Apr 2020 18:09:10 +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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 762C6E08BD for ; Sun, 12 Apr 2020 18:09:10 +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 7928434F0D7 for ; Sun, 12 Apr 2020 18:09:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D300D150 for ; Sun, 12 Apr 2020 18:09:06 +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: <1586714644.dc7faccb8dccf0e3b418bef7b23f49b004fb4208.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtcore/metadata.xml 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: dc7faccb8dccf0e3b418bef7b23f49b004fb4208 X-VCS-Branch: master Date: Sun, 12 Apr 2020 18:09:06 +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: b5739b28-b550-4827-ae5d-28058aa33d48 X-Archives-Hash: a9455ebd6f0517e65495ad0a3aeb4992 commit: dc7faccb8dccf0e3b418bef7b23f49b004fb4208 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 12 17:46:45 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 12 18:04:04 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=dc7faccb dev-qt/qtcore: In >=5.15, disable statx only with IUSE="old-kernel" Bug: https://bugs.gentoo.org/672856 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtcore/metadata.xml | 3 ++- dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild | 2 +- dev-qt/qtcore/qtcore-5.15.9999.ebuild | 8 ++++---- dev-qt/qtcore/qtcore-5.9999.ebuild | 8 ++++---- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml index 8342d1e9..9354e57a 100644 --- a/dev-qt/qtcore/metadata.xml +++ b/dev-qt/qtcore/metadata.xml @@ -6,7 +6,8 @@ Gentoo Qt Project - Disable syscalls not available on Linux kernels older than 3.17 + Disable syscalls not available on Linux kernels older than 3.17 + Disable syscalls not available on Linux kernels older than 4.11 Enable native journald logging support diff --git a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild index 8fe97564..16b2ab23 100644 --- a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild @@ -67,7 +67,7 @@ src_prepare() { src_configure() { local myconf=( - -no-feature-statx # bug 672856 + -no-feature-statx # needs Linux 4.11, bug 672856 $(qt_use icu) $(qt_use !icu iconv) $(qt_use systemd journald) diff --git a/dev-qt/qtcore/qtcore-5.15.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.9999.ebuild index 8fe97564..449fddfc 100644 --- a/dev-qt/qtcore/qtcore-5.15.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.9999.ebuild @@ -49,9 +49,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 7 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" - ewarn "dev-qt/qtcore to function on this kernel properly. See Bug #669994." + if kernel_is -lt 4 11 && ! use old-kernel; then + ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for" + ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856" fi } @@ -67,7 +67,6 @@ src_prepare() { src_configure() { local myconf=( - -no-feature-statx # bug 672856 $(qt_use icu) $(qt_use !icu iconv) $(qt_use systemd journald) @@ -75,6 +74,7 @@ src_configure() { use old-kernel && myconf+=( -no-feature-renameat2 # needs Linux 3.16, bug 669994 -no-feature-getentropy # needs Linux 3.17, bug 669994 + -no-feature-statx # needs Linux 4.11, bug 672856 ) qt5-build_src_configure } diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild index ff1430d7..77ca00e6 100644 --- a/dev-qt/qtcore/qtcore-5.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.9999.ebuild @@ -48,9 +48,9 @@ QT5_GENTOO_PRIVATE_CONFIG=( 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" - ewarn "dev-qt/qtcore to function on this kernel properly. See Bug #669994." + if kernel_is -lt 4 11 && ! use old-kernel; then + ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for" + ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856" fi } @@ -66,7 +66,6 @@ src_prepare() { src_configure() { local myconf=( - -no-feature-statx # bug 672856 $(qt_use icu) $(qt_use !icu iconv) $(qt_use systemd journald) @@ -74,6 +73,7 @@ src_configure() { use old-kernel && myconf+=( -no-feature-renameat2 # needs Linux 3.16, bug 669994 -no-feature-getentropy # needs Linux 3.17, bug 669994 + -no-feature-statx # needs Linux 4.11, bug 672856 ) qt5-build_src_configure }