| 1 |
commit: 219094c8f5c89461f25d65d8b0b1b8a03307fbaa |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 3 17:49:16 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 8 20:07:00 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=219094c8 |
| 7 |
|
| 8 |
qt5-build.eclass: Cleanup quirks for no longer available versions |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/qt5-build.eclass | 31 ++----------------------------- |
| 13 |
1 file changed, 2 insertions(+), 29 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 16 |
index 70f2bed9e4e..3189f0c086f 100644 |
| 17 |
--- a/eclass/qt5-build.eclass |
| 18 |
+++ b/eclass/qt5-build.eclass |
| 19 |
@@ -174,14 +174,8 @@ qt5-build_src_prepare() { |
| 20 |
qt5_symlink_tools_to_build_dir |
| 21 |
|
| 22 |
# Avoid unnecessary qmake recompilations |
| 23 |
- if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then |
| 24 |
- sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \ |
| 25 |
- -e '/echo "Done."/a fi' \ |
| 26 |
- configure || die "sed failed (skip qmake bootstrap)" |
| 27 |
- else |
| 28 |
- sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \ |
| 29 |
- configure || die "sed failed (skip qmake bootstrap)" |
| 30 |
- fi |
| 31 |
+ sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \ |
| 32 |
+ -e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)" |
| 33 |
|
| 34 |
# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake |
| 35 |
sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \ |
| 36 |
@@ -196,12 +190,6 @@ qt5-build_src_prepare() { |
| 37 |
sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ |
| 38 |
configure || die "sed failed (QMAKE_CONF_COMPILER)" |
| 39 |
|
| 40 |
- if [[ ${QT5_MINOR_VERSION} -le 7 ]]; then |
| 41 |
- # Respect toolchain and flags in config.tests |
| 42 |
- find config.tests/unix -name '*.test' -type f -execdir \ |
| 43 |
- sed -i -e 's/-nocache //' '{}' + || die |
| 44 |
- fi |
| 45 |
- |
| 46 |
# Don't inject -msse/-mavx/... into CXXFLAGS when detecting |
| 47 |
# compiler support for extended instruction sets (bug 552942) |
| 48 |
find config.tests/common -name '*.pro' -type f -execdir \ |
| 49 |
@@ -579,9 +567,6 @@ qt5_base_configure() { |
| 50 |
# build shared libraries |
| 51 |
-shared |
| 52 |
|
| 53 |
- # always enable large file support |
| 54 |
- $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -largefile) |
| 55 |
- |
| 56 |
# disabling accessibility is not recommended by upstream, as |
| 57 |
# it will break QStyle and may break other internal parts of Qt |
| 58 |
-accessibility |
| 59 |
@@ -624,7 +609,6 @@ qt5_base_configure() { |
| 60 |
|
| 61 |
# disable everything to prevent automagic deps (part 2) |
| 62 |
-no-gtk |
| 63 |
- $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-pulseaudio -no-alsa) |
| 64 |
|
| 65 |
# exclude examples and tests from default build |
| 66 |
-nomake examples |
| 67 |
@@ -637,10 +621,6 @@ qt5_base_configure() { |
| 68 |
# print verbose information about each configure test |
| 69 |
-verbose |
| 70 |
|
| 71 |
- # always enable iconv support |
| 72 |
- # since 5.8 this is handled in qtcore |
| 73 |
- $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv) |
| 74 |
- |
| 75 |
# disable everything to prevent automagic deps (part 3) |
| 76 |
-no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus |
| 77 |
|
| 78 |
@@ -667,10 +647,6 @@ qt5_base_configure() { |
| 79 |
# disable undocumented X11-related flags, override in qtgui |
| 80 |
# (not shown in ./configure -help output) |
| 81 |
-no-xkb |
| 82 |
- $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-xrender) |
| 83 |
- |
| 84 |
- # disable obsolete/unused X11-related flags |
| 85 |
- $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-mitshm -no-xcursor -no-xfixes -no-xrandr -no-xshape -no-xsync) |
| 86 |
|
| 87 |
# always enable session management support: it doesn't need extra deps |
| 88 |
# at configure time and turning it off is dangerous, see bug 518262 |
| 89 |
@@ -686,9 +662,6 @@ qt5_base_configure() { |
| 90 |
# disable libinput-based generic plugin by default, override in qtgui |
| 91 |
-no-libinput |
| 92 |
|
| 93 |
- # disable gstreamer by default, override in qtmultimedia |
| 94 |
- $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-gstreamer) |
| 95 |
- |
| 96 |
# respect system proxies by default: it's the most natural |
| 97 |
# setting, and it'll become the new upstream default in 5.8 |
| 98 |
-system-proxies |
Archives