From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 03/16] package/python-sip: remove qt4 support
Date: Wed, 6 Feb 2019 15:10:45 +0100 [thread overview]
Message-ID: <20190206141058.24155-3-peter@korsgaard.com> (raw)
In-Reply-To: <20190206141058.24155-1-peter@korsgaard.com>
python-pyqt has been removed and qt4 support is about to be dropped, so
remove the support from python-sip as well.
Adjust the dependencies to match the dependencies of qt5, and ensure that
qt5base is selected.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-sip/Config.in | 14 ++++++++------
package/python-sip/python-sip.mk | 4 ----
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/package/python-sip/Config.in b/package/python-sip/Config.in
index 1f8961d0df..4ce4f89b2a 100644
--- a/package/python-sip/Config.in
+++ b/package/python-sip/Config.in
@@ -2,17 +2,19 @@ comment "python-sip needs a toolchain w/ C++, threads"
depends on BR2_USE_MMU
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
-comment "python-sip needs qt or qt5"
+comment "python-sip needs qt5"
depends on BR2_USE_MMU
depends on BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS
- depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
+ depends on !BR2_PACKAGE_QT5
config BR2_PACKAGE_PYTHON_SIP
bool "python-sip"
- depends on BR2_INSTALL_LIBSTDCPP # qt
- depends on BR2_TOOLCHAIN_HAS_THREADS # qt
- depends on BR2_USE_MMU # qt
- depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
+ depends on BR2_INSTALL_LIBSTDCPP # qt5
+ depends on BR2_USE_WCHAR # qt5
+ depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5
+ depends on !BR2_STATIC_LIBS # qt5
+ depends on BR2_PACKAGE_QT5
+ select BR2_PACKAGE_QT5BASE
help
SIP is a tool that makes it very easy to create Python
bindings for C and C++ libraries. It was originally
diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk
index 76d7d04187..69019f5f19 100644
--- a/package/python-sip/python-sip.mk
+++ b/package/python-sip/python-sip.mk
@@ -10,11 +10,7 @@ PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON
PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0
PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3
-ifeq ($(BR2_PACKAGE_QT5),y)
PYTHON_SIP_DEPENDENCIES = qt5base
-else
-PYTHON_SIP_DEPENDENCIES = qt
-endif
ifeq ($(BR2_PACKAGE_PYTHON),y)
PYTHON_SIP_DEPENDENCIES += python
--
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 ` Peter Korsgaard [this message]
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 ` [Buildroot] [PATCH 14/16] package/quazip: " Peter Korsgaard
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-3-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.