From e643be1bfc3dccd82e0940d61c5f6954f4033a21 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 9 Feb 2022 17:50:41 +0100 Subject: [PATCH] package/gpsd: drop python2 support Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/gpsd/Config.in | 4 ++-- package/gpsd/gpsd.mk | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 1da9a5ce2a..b66d0952dd 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -81,8 +81,8 @@ config BR2_PACKAGE_GPSD_SQUELCH config BR2_PACKAGE_GPSD_PYTHON bool "build Python support and modules" - depends on BR2_USE_WCHAR # python - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + depends on BR2_USE_WCHAR # python3 + select BR2_PACKAGE_PYTHON3 help Python libraries and tools for the gpsd service daemon including gpsfake test harness. diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 636c6c95ba..4388b7e24d 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -194,10 +194,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) GPSD_SCONS_OPTS += \ python=yes \ python_libdir="/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages" -else ifeq ($(BR2_PACKAGE_PYTHON),y) -GPSD_SCONS_OPTS += \ - python=yes \ - python_libdir="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" else GPSD_SCONS_OPTS += python=no endif