Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] qt5virtualkeyboard: Install new library
@ 2019-03-08 17:09 Mark Thompson
  2019-03-08 18:07 ` Yann E. MORIN
  0 siblings, 1 reply; 5+ messages in thread
From: Mark Thompson @ 2019-03-08 17:09 UTC (permalink / raw)
  To: buildroot

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 <mark.thompson@starleaf.com>
---
 package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
index 8ce3169774..6c255c98da 100644
--- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
+++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
@@ -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)
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] qt5virtualkeyboard: Install new library
  2019-03-08 17:09 [Buildroot] [PATCH] qt5virtualkeyboard: Install new library Mark Thompson
@ 2019-03-08 18:07 ` Yann E. MORIN
  2019-03-08 18:33   ` [Buildroot] [PATCH v2] " Mark Thompson
  0 siblings, 1 reply; 5+ messages in thread
From: Yann E. MORIN @ 2019-03-08 18:07 UTC (permalink / raw)
  To: buildroot

Mark, All,

On 2019-03-08 17:09 +0000, Mark Thompson spake thusly:
> 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 <mark.thompson@starleaf.com>
> ---
>  package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
> index 8ce3169774..6c255c98da 100644
> --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
> +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
> @@ -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...

>  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)

... 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.

>  	$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML)
>  	$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS)
>  	$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES)
> -- 
> 2.17.1
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2] qt5virtualkeyboard: Install new library
  2019-03-08 18:07 ` Yann E. MORIN
@ 2019-03-08 18:33   ` Mark Thompson
  2019-03-14 21:30     ` Thomas Petazzoni
  0 siblings, 1 reply; 5+ messages in thread
From: Mark Thompson @ 2019-03-08 18:33 UTC (permalink / raw)
  To: buildroot

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 <mark.thompson@starleaf.com>
---
On 08/03/2019 18:07, Yann E. MORIN wrote:
>> +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...
> 
>>  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)
> 
> ... 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(+)

diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
index 8ce3169774..ebe0f1e009 100644
--- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
+++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
@@ -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)
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2] qt5virtualkeyboard: Install new library
  2019-03-08 18:33   ` [Buildroot] [PATCH v2] " Mark Thompson
@ 2019-03-14 21:30     ` Thomas Petazzoni
  2019-03-15 18:07       ` Mark Thompson
  0 siblings, 1 reply; 5+ messages in thread
From: Thomas Petazzoni @ 2019-03-14 21:30 UTC (permalink / raw)
  To: buildroot

Hello,

On Fri, 8 Mar 2019 18:33:39 +0000
Mark Thompson <mark.thompson@starleaf.com> wrote:

> 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 <mark.thompson@starleaf.com>

Thanks, I've applied, with some change (see below).

> diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
> index 8ce3169774..ebe0f1e009 100644
> --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
> +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
> @@ -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
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2] qt5virtualkeyboard: Install new library
  2019-03-14 21:30     ` Thomas Petazzoni
@ 2019-03-15 18:07       ` Mark Thompson
  0 siblings, 0 replies; 5+ messages in thread
From: Mark Thompson @ 2019-03-15 18:07 UTC (permalink / raw)
  To: buildroot

On 14/03/2019 21:30, Thomas Petazzoni wrote:
> Hello,
> 
> On Fri, 8 Mar 2019 18:33:39 +0000
> Mark Thompson <mark.thompson@starleaf.com> wrote:
> 
>> 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 <mark.thompson@starleaf.com>
> 
> Thanks, I've applied, with some change (see below).
> 
>> diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
>> index 8ce3169774..ebe0f1e009 100644
>> --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
>> +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
>> @@ -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 ?

Yep, that works for me.

Thank you!

- Mark

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-03-15 18:07 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-08 17:09 [Buildroot] [PATCH] qt5virtualkeyboard: Install new library Mark Thompson
2019-03-08 18:07 ` Yann E. MORIN
2019-03-08 18:33   ` [Buildroot] [PATCH v2] " Mark Thompson
2019-03-14 21:30     ` Thomas Petazzoni
2019-03-15 18:07       ` Mark Thompson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox