From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] qt5virtualkeyboard: Install new library
Date: Fri, 8 Mar 2019 19:07:50 +0100 [thread overview]
Message-ID: <20190308180750.GW2721@scaer> (raw)
In-Reply-To: <0bc4e8bf-5b7a-69e2-4443-6936700a132f@starleaf.com>
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. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2019-03-08 18:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-08 17:09 [Buildroot] [PATCH] qt5virtualkeyboard: Install new library Mark Thompson
2019-03-08 18:07 ` Yann E. MORIN [this message]
2019-03-08 18:33 ` [Buildroot] [PATCH v2] " Mark Thompson
2019-03-14 21:30 ` Thomas Petazzoni
2019-03-15 18:07 ` Mark Thompson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190308180750.GW2721@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox