commit: dc7faccb8dccf0e3b418bef7b23f49b004fb4208 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Apr 12 17:46:45 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 @@ <name>Gentoo Qt Project</name> </maintainer> <use> - <flag name="old-kernel">Disable syscalls not available on Linux kernels older than 3.17</flag> + <flag name="old-kernel" restrict="<dev-qt/qtcore-5.15.0">Disable syscalls not available on Linux kernels older than 3.17</flag> + <flag name="old-kernel" restrict=">=dev-qt/qtcore-5.15.0">Disable syscalls not available on Linux kernels older than 4.11</flag> <flag name="systemd">Enable native journald logging support</flag> </use> <upstream> 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 }
