From patchwork Mon Feb 17 21:23:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1239600 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48LxtW0KM4z9sRY for ; Tue, 18 Feb 2020 08:28:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0794B8700D; Mon, 17 Feb 2020 21:28:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BvRNA+CzFNfa; Mon, 17 Feb 2020 21:28:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3DF6C87100; Mon, 17 Feb 2020 21:28:31 +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 620BB1BF963 for ; Mon, 17 Feb 2020 21:28:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5B8FA853C5 for ; Mon, 17 Feb 2020 21:28:14 +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 IHcPLJYveWey for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0E24E84D49 for ; Mon, 17 Feb 2020 21:28:13 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bd646.dynamic.kabel-deutschland.de [178.27.214.70]) by dd5108.kasserver.com (Postfix) with ESMTPA id 12551B90207F; Mon, 17 Feb 2020 22:28:11 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Mon, 17 Feb 2020 22:23:32 +0100 Message-Id: <20200217212350.29750-11-anaumann@ultratronik.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217212350.29750-1-anaumann@ultratronik.de> References: <20200217212350.29750-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 10/28] package/qt5wayland: Convert to qmake infra 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: , Cc: Andreas Naumann , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Straightforward conversion except for the wayland-compositor configure option. Signed-off-by: Andreas Naumann --- package/qt5/qt5wayland/qt5wayland.mk | 56 +--------------------------- 1 file changed, 2 insertions(+), 54 deletions(-) diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 4790efc660..b98a28b5c8 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -27,59 +27,7 @@ QT5WAYLAND_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICE endif ifeq ($(BR2_PACKAGE_QT5WAYLAND_COMPOSITOR),y) -QT5WAYLAND_QMAKEFLAGS += CONFIG+=wayland-compositor +QT5WAYLAND_CONF_OPTS += CONFIG+=wayland-compositor endif -define QT5WAYLAND_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5WAYLAND_QMAKEFLAGS)) -endef - -define QT5WAYLAND_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5WAYLAND_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5WAYLAND_COMPOSITOR),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -define QT5WAYLAND_INSTALL_COMPOSITOR - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandCompositor.so* $(TARGET_DIR)/usr/lib -endef -else -define QT5WAYLAND_INSTALL_COMPOSITOR - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Compositor.so* $(TARGET_DIR)/usr/lib -endef -endif -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5_VERSION_LATEST),yy) -define QT5WAYLAND_INSTALL_COMPOSITOR_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtWayland $(TARGET_DIR)/usr/qml/ -endef -endif -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y) -define QT5WAYLAND_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/wayland $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif -else -define QT5WAYLAND_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/wayland $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif -endif - -define QT5WAYLAND_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandClient.so* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/wayland* $(TARGET_DIR)/usr/lib/qt/plugins - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforms/libqwayland* $(TARGET_DIR)/usr/lib/qt/plugins/platforms - $(QT5WAYLAND_INSTALL_COMPOSITOR) - $(QT5WAYLAND_INSTALL_COMPOSITOR_QMLS) - $(QT5WAYLAND_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package))