qt5virtualkeyboard: Install new library
PATCH 1/1 qt5virtualkeyboard: Install new library
Between Qt 5.11 and 5.12 the virtual keyboard package gained a new top-level library, libQt5VirtualKeyboard.so, which is then used by all of the plugins it installs. This change makes Buildroot aware of the new library so that we install it to the target filesystem.
--- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +7 -0
@@ -75,6 +75,12 @@ define QT5VIRTUALKEYBOARD_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install endef +ifeq ($(BR2_STATIC_LIBS),) +define QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5VirtualKeyboard*.so.* $(TARGET_DIR)/usr/lib +endef +endif + ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML mkdir -p $(TARGET_DIR)/usr/qml/QtQuick/Enterprise
@@ -97,6 +103,7 @@ define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so \ $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts + $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS) $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML) $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS) $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES)
Signature · 1 line
2.17.1
PATCH 1/1 qt5virtualkeyboard: Install new library
Mark, All,
On 2019-03-08 17:09 +0000, Mark Thompson spake thusly:
Quoted 15 lines
Between Qt 5.11 and 5.12 the virtual keyboard package gained a new top-level library, libQt5VirtualKeyboard.so, which is then used by all of the plugins it installs. This change makes Buildroot aware of the new library so that we install it to the target filesystem.
Signed-off-by Mark Thompson <[email protected]>--- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 +++++++ 1 file changed, 7 insertions(+)package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +0
-0
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk define QT5VIRTUALKEYBOARD_INSTALL_STAGING_CMDS · line 82
Quoted 8 lines
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +5
-0@@ -75,6 +75,12 @@ define QT5VIRTUALKEYBOARD_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install endef +ifeq ($(BR2_STATIC_LIBS),) +define QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5VirtualKeyboard*.so.* $(TARGET_DIR)/usr/lib +endef +endif
You said that this new library was introduced with qt-5.12, but here you define it unconditionally...
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS · line 106
Quoted 8 lines
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +1
-0ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML mkdir -p $(TARGET_DIR)/usr/qml/QtQuick/Enterprise@@ -97,6 +103,7 @@ define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so \ $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts + $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS)
... and here you use it unconditionally, which means that, when qt-5.6 is enabled, this code will still be used, and thus the copy will be attempted, but will fail as the library does not exist in before qt-5.12.
Regards,
Yann E. MORIN.
Quoted 9 lines
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +0
-0$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML) $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS) $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES)Signature · 5 lines
2.17.1 _______________________________________________ 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. | '------------------------------^-------^------------------^--------------------'
PATCH v2 1/1 qt5virtualkeyboard: Install new library
Between Qt 5.11 and 5.12 the virtual keyboard package gained a new top-level library, libQt5VirtualKeyboard.so, which is then used by all of the plugins it installs. This change makes Buildroot aware of the new library so that we install it to the target filesystem.
---
Quoted 9 lines · Yann E. MORIN
Review
Quoted 5 lines
(quoted diff) +5
-0+ifeq ($(BR2_STATIC_LIBS),) +define QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5VirtualKeyboard*.so.* $(TARGET_DIR)/usr/lib +endef +endifYou said that this new library was introduced with qt-5.12, but here you define it unconditionally...
Quoted 13 lines
Review define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS · line 106
Quoted 8 lines
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
defineQT5VIRTUALKEYBOARD_INSTALL_TARGET_QML(quoted diff) +1
-0mkdir -p $(TARGET_DIR)/usr/qml/QtQuick/Enterprise@@ -97,6 +103,7 @@ define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so \ $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts + $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS)... and here you use it unconditionally, which means that, when qt-5.6 is enabled, this code will still be used, and thus the copy will be attempted, but will fail as the library does not exist in before qt-5.12.
Good point, I was only considering the recent 5.11 -> 5.12 change and ignoring that it can still be built with 5.6.
New version enclosing.
Thanks,
- Mark
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 6 ++++++ 1 file changed, 6 insertions(+)
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +6 -0
@@ -81,6 +81,11 @@ define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Enterprise/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick/Enterprise/ endef else +ifeq ($(BR2_STATIC_LIBS),) +define QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5VirtualKeyboard*.so.* $(TARGET_DIR)/usr/lib +endef +endif define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML mkdir -p $(TARGET_DIR)/usr/qml/QtQuick cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick/
@@ -97,6 +102,7 @@ define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so \ $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts + $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS) $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML) $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS) $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES)
Signature · 1 line
2.17.1
PATCH v2 1/1 qt5virtualkeyboard: Install new library
Hello,
Quoted 6 lines · On Fri, 8 Mar 2019 18:33:39 +0000 Mark Thompson <[email protected]>…
Between Qt 5.11 and 5.12 the virtual keyboard package gained a new top-level library, libQt5VirtualKeyboard.so, which is then used by all of the plugins it installs. This change makes Buildroot aware of the new library so that we install it to the target filesystem.
Signed-off-by Mark Thompson <[email protected]>
Thanks, I've applied, with some change (see below).
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML · line 88
Quoted 13 lines
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +5
-0@@ -81,6 +81,11 @@ define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Enterprise/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick/Enterprise/ endef else +ifeq ($(BR2_STATIC_LIBS),) +define QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5VirtualKeyboard*.so.* $(TARGET_DIR)/usr/lib +endef +endif
Instead of "hijacking" the condition used for the QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML definition, I've created a separate condition:
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST):$(BR2_STATIC_LIBS),y:) +define QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS
+ cp -dpf $(STAGING_DIR)/usr/lib/libQt5VirtualKeyboard*.so.* $(TARGET_DIR)/usr/lib
+endef
+endif
Could you double check that the latest master works for you ?
Thanks!
Thomas Petazzoni
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 1/1 qt5virtualkeyboard: Install new library
Quoted 38 lines · Thomas Petazzoni
Hello,
Quoted 6 lines · On Fri, 8 Mar 2019 18:33:39 +0000 Mark Thompson <[email protected]>…
Between Qt 5.11 and 5.12 the virtual keyboard package gained a new top-level library, libQt5VirtualKeyboard.so, which is then used by all of the plugins it installs. This change makes Buildroot aware of the new library so that we install it to the target filesystem.
Signed-off-by Mark Thompson <[email protected]>Thanks, I've applied, with some change (see below).
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML · line 88
Quoted 13 lines
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +5
-0@@ -81,6 +81,11 @@ define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Enterprise/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick/Enterprise/ endef else +ifeq ($(BR2_STATIC_LIBS),) +define QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5VirtualKeyboard*.so.* $(TARGET_DIR)/usr/lib +endef +endifInstead of "hijacking" the condition used for the
QT5VIRTUALKEYBOARD_INSTALL_TARGET_QMLdefinition, I've created a separate condition:package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +5
-0+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST):$(BR2_STATIC_LIBS),y:) +define QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5VirtualKeyboard*.so.* $(TARGET_DIR)/usr/lib +endef +endif
Quoted 1 line
Could you double check that the latest master works for you ?
Yep, that works for me.
Thank you!
- Mark