Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
Date: Thu, 07 Jan 2021 19:02:06
Message-Id: 1610046021.cb4829c9aebc800b0270d8d4df56ebe6f325ea83.asturm@gentoo
1 commit: cb4829c9aebc800b0270d8d4df56ebe6f325ea83
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 7 19:00:21 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 7 19:00:21 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cb4829c9
7
8 qt5-build.eclass: Limit qtchooser config install to <5.15.2-r3
9
10 Syncing with dev-qt/qtcore-5.15.2-r2 in Gentoo ebuild repo.
11
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 eclass/qt5-build.eclass | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17 diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
18 index 8e586c83..5e15ab3d 100644
19 --- a/eclass/qt5-build.eclass
20 +++ b/eclass/qt5-build.eclass
21 @@ -261,7 +261,7 @@ qt5-build_src_install() {
22 "${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \
23 || die "sed failed (qconfig.h)"
24
25 - if ver_test -lt 5.15.2-r2; then
26 + if ver_test -lt 5.15.2-r3; then
27 # install qtchooser configuration file
28 cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die
29 ${QT5_BINDIR}