1 |
commit: dcf4883249bd38dcec81d93ae22ab899eae7f1db |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 2 13:57:16 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 27 01:32:23 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=dcf48832 |
7 |
|
8 |
qt5-build.eclass: Limit RDEPEND on qtchooser to Qt versions <5.15.2 |
9 |
|
10 |
Install qtchooser configuration only for <=dev-qt/qtcore-5.15.2-r1 |
11 |
|
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
eclass/qt5-build.eclass | 40 ++++++++++++++++++++-------------------- |
15 |
1 file changed, 20 insertions(+), 20 deletions(-) |
16 |
|
17 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
18 |
index ad7f6a64..503d0c3f 100644 |
19 |
--- a/eclass/qt5-build.eclass |
20 |
+++ b/eclass/qt5-build.eclass |
21 |
@@ -112,10 +112,9 @@ BDEPEND=" |
22 |
if [[ ${PN} != qttest ]]; then |
23 |
DEPEND+=" test? ( ~dev-qt/qttest-${PV} )" |
24 |
fi |
25 |
-RDEPEND=" |
26 |
- dev-qt/qtchooser |
27 |
-" |
28 |
- |
29 |
+if ver_test -lt 5.15.2; then |
30 |
+ RDEPEND+=" dev-qt/qtchooser" |
31 |
+fi |
32 |
|
33 |
###### Phase functions ###### |
34 |
|
35 |
@@ -258,22 +257,23 @@ qt5-build_src_install() { |
36 |
"${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \ |
37 |
|| die "sed failed (qconfig.h)" |
38 |
|
39 |
- # install qtchooser configuration file |
40 |
- cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die |
41 |
- ${QT5_BINDIR} |
42 |
- ${QT5_LIBDIR} |
43 |
- _EOF_ |
44 |
- |
45 |
- ( |
46 |
- insinto /etc/xdg/qtchooser |
47 |
- doins "${T}/qt5-${CHOST}.conf" |
48 |
- ) |
49 |
- |
50 |
- # convenience symlinks |
51 |
- dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf |
52 |
- dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf |
53 |
- # TODO bug 522646: write an eselect module to manage default.conf |
54 |
- dosym qt5.conf /etc/xdg/qtchooser/default.conf |
55 |
+ if ver_test -lt 5.15.2-r2; then |
56 |
+ # install qtchooser configuration file |
57 |
+ cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die |
58 |
+ ${QT5_BINDIR} |
59 |
+ ${QT5_LIBDIR} |
60 |
+ _EOF_ |
61 |
+ |
62 |
+ ( |
63 |
+ insinto /etc/xdg/qtchooser |
64 |
+ doins "${T}/qt5-${CHOST}.conf" |
65 |
+ ) |
66 |
+ |
67 |
+ # convenience symlinks |
68 |
+ dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf |
69 |
+ dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf |
70 |
+ dosym qt5.conf /etc/xdg/qtchooser/default.conf |
71 |
+ fi |
72 |
fi |
73 |
|
74 |
qt5_install_module_config |