diff options
| author |   Matthias Dahl <matthias.dahl@binary-island.eu> | 2017-04-20 09:55:36 +0200 |
|---|---|---|
| committer |   Davide Pesavento <pesa@gentoo.org> | 2017-04-24 02:51:37 +0200 |
| commit | 53e51ab097bd73ec05d56c389bc68da17eaf22d5 (patch) | |
| tree | 00cd119b130cf63d344b4148e23c279c35356d28 /eclass/qt5-build.eclass | |
| parent | dev-qt: update copyright year (diff) | |
| download | qt-53e51ab097bd73ec05d56c389bc68da17eaf22d5.tar.gz qt-53e51ab097bd73ec05d56c389bc68da17eaf22d5.tar.bz2 qt-53e51ab097bd73ec05d56c389bc68da17eaf22d5.zip | |
qt5-build.eclass: workaround global disabling of dbus for qtbase >= 5.8
Passing a 'no-dbus' to configure will result in a QT_NO_DBUS macro in
QtCore/qconfig.h when qtcore is compiled -- causing all sorts of havoc
naturally while compiling packages that require QtDBus.
If we use 'dbus-runtime' instead, there will be no hard dependencies
on DBus, while avoiding that macro altogether.
I recompiled Qt 5.8.9999 with it, as well as kde-frameworks/*,
and everything turned out fine. I did not find any side-effects.
Gentoo-Bug: 599636
Diffstat (limited to 'eclass/qt5-build.eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index d679da40..0c92a306 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -630,7 +630,12 @@ qt5_base_configure() { $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv) # disable everything to prevent automagic deps (part 3) - -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus + -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig + + # FIXME + # since 5.8, disabling dbus generates a QT_NO_DBUS in QtCore/qconfig.h, + # thus specify runtime loading of libdbus to avoid the #define + $([[ ${QT5_MINOR_VERSION} -ge 8 ]] && echo -dbus-runtime || echo -no-dbus) # let portage handle stripping -no-strip |