From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/
Date: Thu, 9 Apr 2020 18:10:10 +0000 (UTC) [thread overview]
Message-ID: <1586455790.35678fe2decea3d9de1a317c9e8e6a031437b334.asturm@gentoo> (raw)
commit: 35678fe2decea3d9de1a317c9e8e6a031437b334
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 8 08:50:19 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 18:09:50 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=35678fe2
dev-qt/qtcore: enable renameat2 and getentropy conditionally
Add USE=old-kernel to switch off the new syscalls.
renameat2() and getentropy() are not available until linux-3.17.
Bug: https://bugs.gentoo.org/669994
Package-Manager: Portage-2.3.88, Repoman-2.3.18
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
Closes: https://github.com/gentoo/qt/pull/214
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtcore/metadata.xml | 1 +
dev-qt/qtcore/qtcore-5.14.9999.ebuild | 16 ++++++++++++++--
dev-qt/qtcore/qtcore-5.15.9999.ebuild | 16 ++++++++++++++--
dev-qt/qtcore/qtcore-5.9999.ebuild | 18 +++++++++++++++---
4 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index c612265c..34d2b272 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Qt Project</name>
</maintainer>
<use>
+ <flag name="old-kernel">disable new syscalls for Linux kernel >= 3.17</flag>
<flag name="systemd">Enable native journald logging support</flag>
</use>
<upstream>
diff --git a/dev-qt/qtcore/qtcore-5.14.9999.ebuild b/dev-qt/qtcore/qtcore-5.14.9999.ebuild
index 9b476abf..a6f5b7fc 100644
--- a/dev-qt/qtcore/qtcore-5.14.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.14.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
QT5_MODULE="qtbase"
-inherit qt5-build
+inherit linux-info qt5-build
DESCRIPTION="Cross-platform application development framework"
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
-IUSE="icu systemd"
+IUSE="icu old-kernel systemd"
DEPEND="
dev-libs/double-conversion:=
@@ -44,6 +44,16 @@ QT5_GENTOO_PRIVATE_CONFIG=(
PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 703306
+pkg_pretend() {
+ if use kernel_linux; then
+ 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."
+ fi
+ fi
+}
+
src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
@@ -59,6 +69,8 @@ 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)
)
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 9b476abf..a6f5b7fc 100644
--- a/dev-qt/qtcore/qtcore-5.15.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
QT5_MODULE="qtbase"
-inherit qt5-build
+inherit linux-info qt5-build
DESCRIPTION="Cross-platform application development framework"
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
-IUSE="icu systemd"
+IUSE="icu old-kernel systemd"
DEPEND="
dev-libs/double-conversion:=
@@ -44,6 +44,16 @@ QT5_GENTOO_PRIVATE_CONFIG=(
PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 703306
+pkg_pretend() {
+ if use kernel_linux; then
+ 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."
+ fi
+ fi
+}
+
src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
@@ -59,6 +69,8 @@ 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)
)
qt5-build_src_configure
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 4ef01cf6..c39aa396 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
QT5_MODULE="qtbase"
-inherit qt5-build
+inherit linux-info qt5-build
DESCRIPTION="Cross-platform application development framework"
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
-IUSE="icu systemd"
+IUSE="icu old-kernel systemd"
DEPEND="
dev-libs/double-conversion:=
@@ -43,6 +43,16 @@ QT5_GENTOO_PRIVATE_CONFIG=(
!:xml
)
+pkg_pretend() {
+ if use kernel_linux; then
+ 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."
+ fi
+ fi
+}
+
src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
@@ -58,6 +68,8 @@ 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)
)
qt5-build_src_configure
next reply other threads:[~2020-04-09 18:10 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-09 18:10 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-03 23:09 [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/ Andreas Sturmlechner
2023-10-08 15:21 Andreas Sturmlechner
2023-10-07 20:40 Andreas Sturmlechner
2023-09-03 8:02 Andreas Sturmlechner
2023-06-22 15:53 Andreas Sturmlechner
2022-06-18 14:27 Andreas Sturmlechner
2022-05-20 6:46 Andreas Sturmlechner
2022-03-21 10:06 Andreas Sturmlechner
2021-02-02 0:49 Andreas Sturmlechner
2020-04-12 18:09 Andreas Sturmlechner
2020-04-10 21:33 Andreas Sturmlechner
2020-04-09 18:18 Andreas Sturmlechner
2020-04-09 18:10 Andreas Sturmlechner
2020-04-09 18:10 Andreas Sturmlechner
2020-04-09 18:10 Andreas Sturmlechner
2019-08-24 9:14 Jimi Huotari
2019-08-04 12:43 Michael Palimaka
2019-01-07 20:33 Davide Pesavento
2019-01-07 1:04 Davide Pesavento
2018-09-13 10:30 Jimi Huotari
2018-02-22 22:19 Andreas Sturmlechner
2018-02-06 12:32 Michael Palimaka
2018-02-02 11:54 Michael Palimaka
2017-12-09 23:02 Jimi Huotari
2017-09-08 15:52 Michael Palimaka
2017-04-18 16:15 Davide Pesavento
2017-04-18 16:15 Davide Pesavento
2017-01-25 18:30 Michael Palimaka
2017-01-25 17:24 Michael Palimaka
2016-11-30 17:23 Michael Palimaka
2016-04-24 15:52 Davide Pesavento
2016-04-24 15:52 Davide Pesavento
2015-05-10 1:18 Davide Pesavento
2015-03-26 1:49 Davide Pesavento
2014-12-09 3:22 Davide Pesavento
2014-11-10 3:02 Davide Pesavento
2014-10-27 0:53 Davide Pesavento
2014-10-13 19:35 Davide Pesavento
2014-09-01 0:26 Davide Pesavento
2014-08-27 2:16 Davide Pesavento
2014-07-29 22:14 Davide Pesavento
2014-07-24 1:05 Davide Pesavento
2014-06-01 2:41 Davide Pesavento
2014-06-01 2:41 Davide Pesavento
2014-05-27 10:48 Davide Pesavento
2014-05-23 18:18 Davide Pesavento
2013-04-22 1:07 Davide Pesavento
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1586455790.35678fe2decea3d9de1a317c9e8e6a031437b334.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox