From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 14/16] package/quazip: remove qt4 support
Date: Wed, 6 Feb 2019 15:10:56 +0100 [thread overview]
Message-ID: <20190206141058.24155-14-peter@korsgaard.com> (raw)
In-Reply-To: <20190206141058.24155-1-peter@korsgaard.com>
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 <peter@korsgaard.com>
---
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
--
2.11.0
next prev parent reply other threads:[~2019-02-06 14:10 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-06 14:10 [Buildroot] [PATCH 01/16] package/gnuradio: remove qtgui option Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 02/16] package/python-pyqt: remove package Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 03/16] package/python-sip: remove qt4 support Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 04/16] package/sdl: remove qtopia video driver option Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 05/16] package/amd-catalyst: remove control center option Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 06/16] package/opencv: remove qt backend option Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 07/16] package/opencv3: " Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 08/16] package/poppler: remove qt option Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 09/16] package/pinentry: remove qt4 option Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 10/16] package/qtuio: remove package Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 11/16] package/libmediaart: remove qt4 support Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 12/16] package/qextserialport: " Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 13/16] package/gjson: " Peter Korsgaard
2019-02-06 14:10 ` Peter Korsgaard [this message]
2019-02-06 14:10 ` [Buildroot] [PATCH 15/16] package/qwt: " Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 16/16] package/qt: remove package Peter Korsgaard
2019-02-06 14:39 ` [Buildroot] [PATCH 01/16] package/gnuradio: remove qtgui option Gwenhael Goavec-Merou
2019-02-06 14:52 ` Thomas Petazzoni
2019-02-06 14:54 ` Arnout Vandecappelle
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=20190206141058.24155-14-peter@korsgaard.com \
--to=peter@korsgaard.com \
--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