From patchwork Wed Feb 6 14:10:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1037569 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=korsgaard.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="J5t69UUt"; 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 43vkWk0F8Vz9sDL for ; Thu, 7 Feb 2019 01:35:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 88977840A3; Wed, 6 Feb 2019 14:35: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 GMUqFqV1J2YY; Wed, 6 Feb 2019 14:35:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A686C855BD; Wed, 6 Feb 2019 14:35:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 035BE1BF868 for ; Wed, 6 Feb 2019 14:35:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0040C22C44 for ; Wed, 6 Feb 2019 14:35:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ew1VR8mb05Pb for ; Wed, 6 Feb 2019 14:35:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by silver.osuosl.org (Postfix) with ESMTPS id 3B0F720766 for ; Wed, 6 Feb 2019 14:35:41 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id g67so2973264wmd.2 for ; Wed, 06 Feb 2019 06:35:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=snXzqTnJ2Orf65ggnFNYt2ryuwmgi6pYanv9jzbZTTA=; b=J5t69UUthsfWIEu3a+yXOkDVkLGbhOSnyoDDXPs1q+eUvedLdMCBLfIc8nc1ZsIOLT VGbFJvd/M5s5JVqsxzXu2SPyow68uoo5ycvVKB/ikrb5x2V9ihiYCHzSaJFhUVVnYSsD EM1Si2OUEjNc9/GSE1OZ8XNRXt6fUyL506EPyKnoCTZlxPDIA0P2TXumJfOFooxH4+X/ 3P2Z8WBgr4243GC6nvSWvJn/8d9LatZfpIiV+7j2RIVNoE/UYcXp3TK0RBHOPf0DOb2C q1nkq/SsHVhBNrcj4atGzXhd5cAp2csLwx3Ed69g5FpsaT9R2mPE6sIRNLG8nWIXXoJp wG+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=snXzqTnJ2Orf65ggnFNYt2ryuwmgi6pYanv9jzbZTTA=; b=O3gMkPIX+PZkTMduYEH67X/KPOpsnfW60yoWTbcYcJ+1vhOwonz5PkCisezrAQg48U /Kp4UOOUjJzg+uv2P+/nnZuKzjScSRLKb0X4GV4GCFTim1ZrlKR+sWI7p9URHeI0fi85 gkIcdkuIqQXB4QznNHjdy1EwB/mUIKveArFdqrAvHAOpeVUdPf7gyUdd3BDxew+zVwfR /YLV4/JGBAVmceUIUAJxjAL50VF+OmK5frfUcr9kHW4gLEaxqNnRXM+yZBuvZc1gAXgW FlxptOLyp5cXcAp4nreh3JEGCtaGn+GH3oUdAawhBktWFXPhUfTPCrd2P8rMjejCnaU2 P+Ow== X-Gm-Message-State: AHQUAua8584FB4FCv+XCiMU6vdNLml5sRHND1p//26/q2rwiqXlFtKZR V3A6FTJ/NwelbXOEzbKcVbBcqSm/ X-Google-Smtp-Source: AHgI3IYbG2uWET44sRXgrS+EPf7nHg2ZS7x9rCAFip0ksPPyWBhy9kId+6vmjpi905KK4GWhAeV9sg== X-Received: by 2002:a7b:c458:: with SMTP id l24mr3651192wmi.143.1549463739096; Wed, 06 Feb 2019 06:35:39 -0800 (PST) Received: from dell.be.48ers.dk ([2620:0:1055:fd00:ba8a:60ff:feb3:d607]) by smtp.gmail.com with ESMTPSA id y24sm11093767wma.0.2019.02.06.06.35.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Feb 2019 06:35:37 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.89) (envelope-from ) id 1grNuo-0006JQ-CH; Wed, 06 Feb 2019 15:11:02 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Wed, 6 Feb 2019 15:10:56 +0100 Message-Id: <20190206141058.24155-14-peter@korsgaard.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190206141058.24155-1-peter@korsgaard.com> References: <20190206141058.24155-1-peter@korsgaard.com> Subject: [Buildroot] [PATCH 14/16] package/quazip: remove qt4 support 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: Zoltan Gyarmati , Peter Korsgaard MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Qt4 support is about to be dropped, so remove the support from quazip as well. Also add an explicit depends on for qt5 for consistency with other packages. Signed-off-by: Peter Korsgaard --- package/quazip/Config.in | 1 + package/quazip/quazip.mk | 11 ++--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/package/quazip/Config.in b/package/quazip/Config.in index 83537d4613..e980297558 100644 --- a/package/quazip/Config.in +++ b/package/quazip/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_QUAZIP bool "quazip" + depends on BR2_PACKAGE_QT5 select BR2_PACKAGE_ZLIB help QuaZIP is a simple C++ wrapper over Gilles Vollant's diff --git a/package/quazip/quazip.mk b/package/quazip/quazip.mk index 872340ab40..aba8274506 100644 --- a/package/quazip/quazip.mk +++ b/package/quazip/quazip.mk @@ -9,19 +9,12 @@ QUAZIP_SITE = $(call github,stachenov,quazip,$(QUAZIP_VERSION)) QUAZIP_INSTALL_STAGING = YES QUAZIP_DEPENDENCIES = \ zlib \ - $(if $(BR2_PACKAGE_QT),qt) \ - $(if $(BR2_PACKAGE_QT5),qt5base) + qt5base QUAZIP_LICENSE = LGPL-2.1 QUAZIP_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_QT5),y) -QUAZIP_QMAKE = $(QT5_QMAKE) -else -QUAZIP_QMAKE = $(QT_QMAKE) -endif - define QUAZIP_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QUAZIP_QMAKE) PREFIX=/usr) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) PREFIX=/usr) endef define QUAZIP_BUILD_CMDS