From patchwork Sun Nov 10 23:49:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1192681 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kxb5R2D2"; dkim-atps=neutral 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 47B9j26xT3z9sPV for ; Mon, 11 Nov 2019 10:49:40 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C6A0687A43; Sun, 10 Nov 2019 23:49:34 +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 QNVuefZqossI; Sun, 10 Nov 2019 23:49:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 32A3E87918; Sun, 10 Nov 2019 23:49:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 856C31BF429 for ; Sun, 10 Nov 2019 23:49:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7E77983659 for ; Sun, 10 Nov 2019 23:49:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lolI6pTtTEZc for ; Sun, 10 Nov 2019 23:49:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by fraxinus.osuosl.org (Postfix) with ESMTPS id D15B58362C for ; Sun, 10 Nov 2019 23:49:30 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id p20so13786090qtq.5 for ; Sun, 10 Nov 2019 15:49:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=VOX2NQHQMH4kVP/X4unNSZxpSYtwGFpDHy/mtaN42uE=; b=kxb5R2D2cVUzo3jWOLvnK5Wt5vlFaAUf/n/0pTiqHWCupwVslQZAa19jlwUBNxKGo7 O+nZAiNuUhHvxbu3ULtgLvGxHghw6HT5+KuZLPRTyPX1JblnDAZx0AHoKM3X8gFFYEGm Wm+t1dYzZNgrkh4tzuHbKiwduhe+cgGRD1OxsxtCKDufw2qQcnRRhDbquRnd5G6wjVAp //NSj1Fgkw0aAO7Or+vjDWLGWDhsu1kRirMsyK4pTXNN9cZeNh0vak8FQRJci1Q6y4rH AilOQhOFLtp4dQIvQL+Wb07hBSSx3XX7mhrueKROgDgQxdtpDRMnGjl5Pq1nWWOta4AO +ZZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=VOX2NQHQMH4kVP/X4unNSZxpSYtwGFpDHy/mtaN42uE=; b=f15Z7FP1kvPjunRZvdo8qZTZ4nba4kkOAqSpBVbPgiGZ/yUTU/Y6sNOdpWThbTJMFr AZNV3wd4dMsxJWQFK5byUK4UNSx+7alPkShjMRPds9FHwsy3Fmkb9Nduu57lLHxkSc3l 2MdEtDd87QIsFu+C19+bt/+2vxoc/5G90BFP2Zy/Dz81OZ2Ltap+BZ2SGmqsniXvwFGo Sat9oZHJIIcwihfMl2UHQol6gpvh88n9Mw59icVMyQ1SuHF3+8hvDaL/2gNU77+Tngr7 Qd4vF7XcklfLd9Yi/mJyAdkW0t+KzGg57/OX3EKylxJqjvjOpNnPihq9eYLEwN3fldSU 77EQ== X-Gm-Message-State: APjAAAU9BrgxhWnCBLtkKfAKbIlE+a+66c9mfHG5U0lI/4nkYncKd/P+ Dzq2pMO6/Ckih2VVIJNClbaG1XCHZyc= X-Google-Smtp-Source: APXvYqxUfwKeYkctDXzxGlWRCSguBjeSeLrkT83cZ9cOCKapVriH1zMBSzvc8k+XMkLjJnu5hwpXcg== X-Received: by 2002:ac8:5197:: with SMTP id c23mr22464991qtn.343.1573429769639; Sun, 10 Nov 2019 15:49:29 -0800 (PST) Received: from casantos.remote.csb ([179.181.147.174]) by smtp.gmail.com with ESMTPSA id u7sm6412979qkm.127.2019.11.10.15.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Nov 2019 15:49:28 -0800 (PST) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sun, 10 Nov 2019 20:49:16 -0300 Message-Id: <20191110234916.1473-1-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 Subject: [Buildroot] [PATCH] package/qt5wayland: fix installation with Qt 5.6 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: Joshua Henderson , Carlos Santos , Peter Seiderer MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos Install QtWayland only if the latest Qt version is selected. It does not exist in version 5.6. Signed-off-by: Carlos Santos --- package/qt5/qt5wayland/qt5wayland.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 0bda596f3b..4790efc660 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -52,7 +52,7 @@ define QT5WAYLAND_INSTALL_COMPOSITOR cp -dpf $(STAGING_DIR)/usr/lib/libQt5Compositor.so* $(TARGET_DIR)/usr/lib endef endif -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) +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