mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/gnuradio: simplify pyver logic

Browse Source 
Gnuradio only works with python3 since commit 786c783f37
(package/python-numpy: bump to version 1.18.2), so the python2/3 logic for
_PYVER can be dropped.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2022-02-06 11:29:55 +01:00
parent 11f8b9fb45
commit 7162d69194
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
package/gnuradio/gnuradio.mk
View File

@@ -11,13 +11,6 @@ GNURADIO_LICENSE_FILES = COPYING
GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO 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 # host-python-mako and host-python-six are needed for volk to compile
GNURADIO_DEPENDENCIES = \ GNURADIO_DEPENDENCIES = \
host-python3 \ host-python3 \
@@ -125,7 +118,7 @@ GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON
# mandatory to install python modules in site-packages and to use # mandatory to install python modules in site-packages and to use
# correct path for python libraries # correct path for python libraries
GNURADIO_CONF_OPTS += -DGR_PYTHON_RELATIVE=ON \ 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 else
GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF
endif endif