From 67a90aa2065ad87605e5c37a8f206ed4b6f52fdd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 9 Feb 2022 17:51:28 +0100 Subject: [PATCH] package/python-sip: drop python2 support Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/python-sip/python-sip.mk | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk index 1d6c205396..01ccb1ddd5 100644 --- a/package/python-sip/python-sip.mk +++ b/package/python-sip/python-sip.mk @@ -10,19 +10,8 @@ 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 -PYTHON_SIP_DEPENDENCIES = qt5base - -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_SIP_DEPENDENCIES += python -HOST_PYTHON_SIP_DEPENDENCIES += host-python -PYTHON_SIP_LIB_DIR = usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages -PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -PYTHON_SIP_DEPENDENCIES += python3 -HOST_PYTHON_SIP_DEPENDENCIES += host-python3 -PYTHON_SIP_LIB_DIR = usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages -PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON3_VERSION_MAJOR) -endif +PYTHON_SIP_DEPENDENCIES = python3 qt5base +HOST_PYTHON_SIP_DEPENDENCIES = host-python3 define HOST_PYTHON_SIP_CONFIGURE_CMDS (cd $(@D); \ @@ -41,8 +30,8 @@ define PYTHON_SIP_CONFIGURE_CMDS (cd $(@D); \ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(HOST_DIR)/bin/python configure.py \ --bindir $(TARGET_DIR)/usr/bin \ - --destdir $(TARGET_DIR)/$(PYTHON_SIP_LIB_DIR) \ - --incdir $(STAGING_DIR)/$(PYTHON_SIP_INCLUDE_DIR) \ + --destdir $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --incdir $(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --sipdir $(TARGET_DIR)/usr/share/sip \ --sysroot $(STAGING_DIR)/usr \ --use-qmake && \