diff mbox

[1/2] python-sip: allow package to be built using Qt5

Message ID 20160819134225.1490-2-develop@manuel-voegele.de
State Accepted
Headers show

Commit Message

Manuel Vögele Aug. 19, 2016, 1:42 p.m. UTC 
Signed-off-by: Manuel Vögele <develop@manuel-voegele.de>
---
 package/python-sip/Config.in     | 7 ++++++-
 package/python-sip/python-sip.mk | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

Comments

Thomas Petazzoni Aug. 19, 2016, 1:58 p.m. UTC | #1 
Hello,

On Fri, 19 Aug 2016 15:42:24 +0200, Manuel Vögele wrote:
> Signed-off-by: Manuel Vögele <develop@manuel-voegele.de>
> ---
>  package/python-sip/Config.in     | 7 ++++++-
>  package/python-sip/python-sip.mk | 4 ++++
>  2 files changed, 10 insertions(+), 1 deletion(-)

Applied to next, thanks.

Thomas
diff mbox

Patch

diff --git a/package/python-sip/Config.in b/package/python-sip/Config.in
index 45e48ad..1f8961d 100644
--- a/package/python-sip/Config.in
+++ b/package/python-sip/Config.in
@@ -2,12 +2,17 @@  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"
+	depends on BR2_USE_MMU
+	depends on BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_PACKAGE_QT && !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
-	select BR2_PACKAGE_QT
+	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
 	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 d13801f..0c0a947 100644
--- a/package/python-sip/python-sip.mk
+++ b/package/python-sip/python-sip.mk
@@ -10,7 +10,11 @@  PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON
 PYTHON_SIP_LICENSE = SIP license or GPLv2 or GPLv3
 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