Skip to contentSkip to conversation

package/gnuradio: simplify pyver logic

PATCH In review Peter Korsgaard 1 participant 2 messages Feb 6, 2022 – Feb 7, 2022

lore
Share & tools
lore

Peter Korsgaard

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 package/gnuradio/gnuradio.mk | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
package/gnuradio/gnuradio.mk +1 -8
index 658357398d..417a51e067 100644
@@ -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
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#1 lore raw
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

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 <[email protected]>

Committed, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot