package/qt5base: fix xkbcommon option
PATCH v2 1/1 package/qt5base: fix xkbcommon option
- Qt 5.6: according to configure --help the command line option to enable x11 xkbcommon support is '-system-xkbcommon-x11'
- Qt 5.12: according to configure --help the command line option to enable xkbcommon support is '-xkbcommon'
Fixes [1]:
ERROR: Invalid value given for boolean command line option 'xkbcommon'.
[1] http://autobuild.buildroot.net/results/87076d03bb92a9940447ca80fc1f202e35ef39da
---
Changes v1 -> v2:
- remove duplicates of the -xcb option (spotted by Yann E. MORIN)
--- package/qt5/qt5base/qt5base.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/qt5/qt5base/qt5base.mk +7 -1
@@ -153,7 +153,13 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-dir QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) -QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon +QT5BASE_CONFIGURE_OPTS += -xcb +ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) +QT5BASE_CONFIGURE_OPTS += -system-xkbcommon-x11 +else +QT5BASE_CONFIGURE_OPTS += -xkbcommon +endif + QT5BASE_DEPENDENCIES += \ libxcb \ xcb-util-wm \
--
2.21.0
PATCH v2 1/1 package/qt5base: fix xkbcommon option
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Seiderer <[email protected]> writes:
- Qt 5.6: according to configure --help the command line option to enable x11 xkbcommon support is '-system-xkbcommon-x11'
- Qt 5.12: according to configure --help the command line option to enable xkbcommon support is '-xkbcommon'
Fixes [1]:
Quoted 8 lines
ERROR: Invalid value given for boolean command line option 'xkbcommon'.
[1] http://autobuild.buildroot.net/results/87076d03bb92a9940447ca80fc1f202e35ef39da
Signed-off-by Peter Seiderer <[email protected]>---
Changes v1 -> v2:
- remove duplicates of the -xcb option (spotted by Yann E. MORIN)
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard