From patchwork Fri Mar 8 18:33:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 1053648 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=starleaf.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=starleaf-com.20150623.gappssmtp.com header.i=@starleaf-com.20150623.gappssmtp.com header.b="cbAzjyUI"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44GGNZ2Zvnz9s7h for ; Sat, 9 Mar 2019 05:33:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A3CAC8680D; Fri, 8 Mar 2019 18:33:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rH8xd58h0i-Z; Fri, 8 Mar 2019 18:33:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 964EE86816; Fri, 8 Mar 2019 18:33:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5EFE81BF295 for ; Fri, 8 Mar 2019 18:33:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5C02C86816 for ; Fri, 8 Mar 2019 18:33:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Qy0W0adFnLG4 for ; Fri, 8 Mar 2019 18:33:43 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by whitealder.osuosl.org (Postfix) with ESMTPS id 767D48680D for ; Fri, 8 Mar 2019 18:33:43 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id y15so13293100wma.0 for ; Fri, 08 Mar 2019 10:33:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starleaf-com.20150623.gappssmtp.com; s=20150623; h=subject:cc:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=And4cT/xIfrTFkMbuWxKAzgs1m0odz0gfes2aKESb4w=; b=cbAzjyUI36DB/Oiq4EhxB06RRXvp6deklHAujM/wQs76XD7+vFCeSSkHyxnmnZeHqa NjU2xOGmpA5ItrPPRLalRmFSCLZ+C3s4rNM47v/I9OsjhTlEzFIV+LDhGSebkY9hIr18 kPhmNmYupwaoQ/S7jb6JInS6N2yO4yoWvXwG06abvQDZt3TQ3//rms9iqmN+8GI2NvQS +exIpSs8BGGdVqY7psSzt73YQI1hItzypJR+lnzyNSNbMbOkVBSZXsi/s3Vz/RCg9C24 R/xdyljfaxoY04IPHaa4Y/hK/yhqG5+9AeoqLEGBLyym89a1iMpIebixkIWelHIWjyNr ePrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=And4cT/xIfrTFkMbuWxKAzgs1m0odz0gfes2aKESb4w=; b=cfSJzkgoHcJxJv/12aaqRmk5Qh2MprQMl0QJLApoFKgPJrFfUUu/6iM6psqD6/wbTW vvsXEFbUn9lRo0eJ9ZWf/0rUnh7n494uRgIq43dZaV3nWnnnbKaEt63lLO2fKv+BXHsA YYp1ejfcCKi0IHZmo8uNPbJd4iTnka58yILQ36ySAngvBITxtD/IuoOAdaqxWGbGIvDA JcKQ5PVHSWB6+fWuL1U7tefbS2nHiZdw5hxbDp0WvN9/oqWTMf/2ZzVFEyIyyqHZd317 MvpJkDjtCh9FefGl6rq8uqP0+l6H0mlrIITGcaMW8piaSf92ZiS/Lcox6Wv4izwJ1LMl dqOA== X-Gm-Message-State: APjAAAU68aLH/8w8+WoVUatY2dfhcd2UekNIJp9xEqeoRke/Ima6TmsN DwOfkQCywWTw+82A4TRh2RCOnoVDJec= X-Google-Smtp-Source: APXvYqyZ+dGKvrev9mPN3aeY9p6YwH2rD4BETy5NOm7bLMO3OgchzWFKQ8BMr0lgw+jZ62Esec5SLQ== X-Received: by 2002:a1c:80d6:: with SMTP id b205mr10457029wmd.109.1552070021618; Fri, 08 Mar 2019 10:33:41 -0800 (PST) Received: from [10.0.0.193] ([213.210.30.6]) by smtp.gmail.com with ESMTPSA id q5sm14056088wrn.43.2019.03.08.10.33.40 for (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 10:33:40 -0800 (PST) Cc: buildroot@busybox.net References: <0bc4e8bf-5b7a-69e2-4443-6936700a132f@starleaf.com> <20190308180750.GW2721@scaer> From: Mark Thompson Message-ID: <4c8cb1db-58a9-5df0-25cd-538e76e8a7a7@starleaf.com> Date: Fri, 8 Mar 2019 18:33:39 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <20190308180750.GW2721@scaer> Content-Language: en-US Subject: [Buildroot] [PATCH v2] qt5virtualkeyboard: Install new library X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "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 --- 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)