From 7162d69194d606734e7148f009dd034b31d1302a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 6 Feb 2022 11:29:55 +0100 Subject: [PATCH] package/gnuradio: simplify pyver logic Gnuradio only works with python3 since commit 786c783f3796 (package/python-numpy: bump to version 1.18.2), so the python2/3 logic for _PYVER can be dropped. Signed-off-by: Peter Korsgaard --- package/gnuradio/gnuradio.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 658357398d..417a51e067 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -11,13 +11,6 @@ GNURADIO_LICENSE_FILES = COPYING GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO -# needed to determine site-packages path -ifeq ($(BR2_PACKAGE_PYTHON),y) -GNURADIO_PYVER = $(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -GNURADIO_PYVER = $(PYTHON3_VERSION_MAJOR) -endif - # host-python-mako and host-python-six are needed for volk to compile GNURADIO_DEPENDENCIES = \ host-python3 \ @@ -125,7 +118,7 @@ GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON # mandatory to install python modules in site-packages and to use # correct path for python libraries GNURADIO_CONF_OPTS += -DGR_PYTHON_RELATIVE=ON \ - -DGR_PYTHON_DIR=lib/python$(GNURADIO_PYVER)/site-packages + -DGR_PYTHON_DIR=lib/python$(PYTHON3_VERSION_MAJOR)/site-packages else GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF endif