1 |
commit: 57f067c2d27364b6cef3d17d5fdd35297529f7db |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 4 15:31:30 2016 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 4 15:31:30 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57f067c2 |
7 |
|
8 |
qt5-build.eclass: drop support for Qt < 5.6 |
9 |
|
10 |
eclass/qt5-build.eclass | 32 +++++++++----------------------- |
11 |
1 file changed, 9 insertions(+), 23 deletions(-) |
12 |
|
13 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
14 |
index 012918f..7e9bf41 100644 |
15 |
--- a/eclass/qt5-build.eclass |
16 |
+++ b/eclass/qt5-build.eclass |
17 |
@@ -62,11 +62,7 @@ else |
18 |
LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3" |
19 |
fi |
20 |
|
21 |
-if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then |
22 |
- SLOT=5/$(get_version_component_range 1-2) |
23 |
-else |
24 |
- SLOT=5 |
25 |
-fi |
26 |
+SLOT=5/$(get_version_component_range 1-2) |
27 |
|
28 |
case ${PV} in |
29 |
5.9999) |
30 |
@@ -148,14 +144,8 @@ qt5-build_src_unpack() { |
31 |
fi |
32 |
if [[ $(gcc-major-version) -lt 4 ]] || \ |
33 |
[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then |
34 |
- if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then |
35 |
- eerror "GCC version 4.${min_gcc4_minor_version} or later is required to build this package" |
36 |
- die "GCC 4.${min_gcc4_minor_version} or later required" |
37 |
- else |
38 |
- ewarn |
39 |
- ewarn "Using a GCC version lower than 4.${min_gcc4_minor_version} is not supported" |
40 |
- ewarn |
41 |
- fi |
42 |
+ eerror "GCC version 4.${min_gcc4_minor_version} or later is required to build this package" |
43 |
+ die "GCC 4.${min_gcc4_minor_version} or later required" |
44 |
fi |
45 |
fi |
46 |
|
47 |
@@ -532,7 +522,7 @@ qt5_base_configure() { |
48 |
|
49 |
# no need to forcefully build host tools in optimized mode, |
50 |
# just follow the overall debug/release build type |
51 |
- $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-optimized-tools) |
52 |
+ -no-optimized-tools |
53 |
|
54 |
# licensing stuff |
55 |
-opensource -confirm-license |
56 |
@@ -555,7 +545,7 @@ qt5_base_configure() { |
57 |
-no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds |
58 |
|
59 |
# ensure the QML debugging support (qmltooling) is built in qtdeclarative |
60 |
- $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -qml-debug) |
61 |
+ -qml-debug |
62 |
|
63 |
# MIPS DSP instruction set extensions |
64 |
$(is-flagq -mno-dsp && echo -no-mips_dsp) |
65 |
@@ -572,8 +562,7 @@ qt5_base_configure() { |
66 |
|
67 |
# disable everything to prevent automagic deps (part 1) |
68 |
-no-mtdev |
69 |
- -no-journald |
70 |
- $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-syslog) |
71 |
+ -no-journald -no-syslog |
72 |
-no-libpng -no-libjpeg |
73 |
-no-freetype -no-harfbuzz |
74 |
-no-openssl -no-libproxy |
75 |
@@ -614,7 +603,7 @@ qt5_base_configure() { |
76 |
-no-pch |
77 |
|
78 |
# link-time code generation is not something we want to enable by default |
79 |
- $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-ltcg) |
80 |
+ -no-ltcg |
81 |
|
82 |
# reduced relocations cause major breakage on at least arm and ppc, so |
83 |
# don't specify anything and let the configure figure out if they are |
84 |
@@ -625,10 +614,7 @@ qt5_base_configure() { |
85 |
#-use-gold-linker |
86 |
|
87 |
# disable all platform plugins by default, override in qtgui |
88 |
- -no-xcb -no-eglfs -no-kms |
89 |
- $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-gbm) |
90 |
- -no-directfb -no-linuxfb |
91 |
- $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-mirclient) |
92 |
+ -no-xcb -no-eglfs -no-kms -no-gbm -no-directfb -no-linuxfb -no-mirclient |
93 |
|
94 |
# disable undocumented X11-related flags, override in qtgui |
95 |
# (not shown in ./configure -help output) |
96 |
@@ -656,7 +642,7 @@ qt5_base_configure() { |
97 |
|
98 |
# respect system proxies by default: it's the most natural |
99 |
# setting, and it'll become the new upstream default in 5.8 |
100 |
- $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -system-proxies) |
101 |
+ -system-proxies |
102 |
|
103 |
# do not build with -Werror |
104 |
-no-warnings-are-errors |