Skip to contentSkip to conversation

package/qt5base: fix xkbcommon option

PATCH New Peter Seiderer 2 participants 4 messages Mar 21, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 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

---
 package/qt5/qt5base/qt5base.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/qt5/qt5base/qt5base.mk +7 -1
index 14536980a8..b0469172c0 100644
@@ -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 += -xcb -system-xkbcommon-x11
+else
+QT5BASE_CONFIGURE_OPTS += -xcb -xkbcommon
+endif
+
 QT5BASE_DEPENDENCIES   += \
 	libxcb \
 	xcb-util-wm \

--
2.21.0

#1 lore raw

PATCH 1/1 package/qt5base: fix xkbcommon option

Peter, All,

On 2019-03-21 22:23 +0100, Peter Seiderer spake thusly:

Quoted 22 lines

- 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

---
 package/qt5/qt5base/qt5base.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/qt5/qt5base/qt5base.mk +0 -0
index 14536980a8..b0469172c0 100644

package/qt5/qt5base/qt5base.mk QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-dir · line 160

Quoted 9 lines
package/qt5/qt5base/qt5base.mk +5 -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 += -xcb -system-xkbcommon-x11
+else
+QT5BASE_CONFIGURE_OPTS += -xcb -xkbcommon

Two things:

1. -xcb is passed twice: once uncoditionally on the Qt version, and

    once for each Qt version;

2. The build failure you reference is about a qt-5.12 build, which complains about an "Invalid value given for boolean command line option 'xkbcommon'".

So, it looks like qt-5.12 does not linke -xkbcommon, but this is exactly what you are passing with this patch...

Did I misunderstand something?

Cordialement,
Yann E. MORIN.

Quoted 12 lines
package/qt5/qt5base/qt5base.mk +2 -1
+endif
+
 QT5BASE_DEPENDENCIES   += \
 	libxcb \
 	xcb-util-wm \
--

2.21.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/qt5base: fix xkbcommon option

Quoted 37 lines · Yann E. MORIN

Peter, All,

On 2019-03-21 22:23 +0100, Peter Seiderer spake thusly:

Quoted 22 lines

- 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

---
 package/qt5/qt5base/qt5base.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/qt5/qt5base/qt5base.mk +0 -0
index 14536980a8..b0469172c0 100644

package/qt5/qt5base/qt5base.mk QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-dir · line 160

Quoted 9 lines
package/qt5/qt5base/qt5base.mk +5 -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 += -xcb -system-xkbcommon-x11
+else
+QT5BASE_CONFIGURE_OPTS += -xcb -xkbcommon

Two things:

Quoted 6 lines

1. -xcb is passed twice: once uncoditionally on the Qt version, and

    once for each Qt version;

2. The build failure you reference is about a qt-5.12 build, which complains about an "Invalid value given for boolean command line option 'xkbcommon'".

Should be:

ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
QT5BASE_CONFIGURE_OPTS += -xcb
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
QT5BASE_CONFIGURE_OPTS += -system-xkbcommon-x11
else
QT5BASE_CONFIGURE_OPTS += -xkbcommon
endif

So it becomes for

- Qt 5.6: '-system-xkbcommon' --> '-system-xkbcommon-x11'
- Qt 5.12: '-system-xkbcommon' --> '-xkbcommon'

Will fix it in the next patch iteration...

Quoted 3 lines

So, it looks like qt-5.12 does not linke -xkbcommon, but this is exactly what you are passing with this patch...

No, Qt 5.12 is given '-system-xkbcommon' without the patch, and interprets it as -xkbcommon=system and complains that 'system' is neither true or false...

Regards,
Peter

Quoted 19 lines

Did I misunderstand something?

Cordialement,
Yann E. MORIN.

Quoted 12 lines
package/qt5/qt5base/qt5base.mk +2 -1
+endif
+
 QT5BASE_DEPENDENCIES   += \
 	libxcb \
 	xcb-util-wm \
--

2.21.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#3 lore raw

PATCH 1/1 package/qt5base: fix xkbcommon option

Peter, All,

On 2019-03-21 22:56 +0100, Peter Seiderer spake thusly:

Quoted 2 lines · Yann E. MORIN
Quoted 1 line

On 2019-03-21 22:23 +0100, Peter Seiderer spake thusly:

[--SNIP--]

Quoted 27 lines
Quoted 10 lines

package/qt5/qt5base/qt5base.mk QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-dir · line 160

Quoted 7 lines

ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)

package/qt5/qt5base/qt5base.mk +5 -1
-QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon
+QT5BASE_CONFIGURE_OPTS += -xcb
+ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
+QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon-x11
+else
+QT5BASE_CONFIGURE_OPTS += -xcb -xkbcommon

Two things:

Quoted 6 lines

1. -xcb is passed twice: once uncoditionally on the Qt version, and

    once for each Qt version;

2. The build failure you reference is about a qt-5.12 build, which complains about an "Invalid value given for boolean command line option 'xkbcommon'".

Should be:

ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
QT5BASE_CONFIGURE_OPTS += -xcb
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
QT5BASE_CONFIGURE_OPTS += -system-xkbcommon-x11
else
QT5BASE_CONFIGURE_OPTS += -xkbcommon
endif

Quoted 4 lines

So it becomes for

- Qt 5.6: '-system-xkbcommon' --> '-system-xkbcommon-x11'
- Qt 5.12: '-system-xkbcommon' --> '-xkbcommon'

Ah, we're coming from '-system-xkbcommon' not '-xkbcommon'. OK, I had missed that indeed...

Quoted 9 lines

Will fix it in the next patch iteration...

Quoted 3 lines

So, it looks like qt-5.12 does not linke -xkbcommon, but this is exactly what you are passing with this patch...

No, Qt 5.12 is given '-system-xkbcommon' without the patch, and interprets it as -xkbcommon=system and complains that 'system' is neither true or false...

Aha! Thanks for the explanations. That could have been part of the commit log, I guess?

Regards,
Yann E. MORIN.

Quoted 23 lines

Regards,
Peter

Quoted 19 lines

Did I misunderstand something?

Cordialement,
Yann E. MORIN.

Quoted 12 lines
package/qt5/qt5base/qt5base.mk +2 -1
+endif
+
 QT5BASE_DEPENDENCIES   += \
 	libxcb \
 	xcb-util-wm \
--

2.21.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'