* [Buildroot] [PATCH] package/gnuradio: simplify pyver logic
@ 2022-02-06 10:29 Peter Korsgaard
2022-02-07 18:19 ` Peter Korsgaard
0 siblings, 1 reply; 2+ messages in thread
From: Peter Korsgaard @ 2022-02-06 10:29 UTC (permalink / raw)
To: buildroot; +Cc: Gwenhael Goavec-Merou
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 <peter@korsgaard.com>
---
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
--
2.20.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH] package/gnuradio: simplify pyver logic
2022-02-06 10:29 [Buildroot] [PATCH] package/gnuradio: simplify pyver logic Peter Korsgaard
@ 2022-02-07 18:19 ` Peter Korsgaard
0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2022-02-07 18:19 UTC (permalink / raw)
To: buildroot; +Cc: Gwenhael Goavec-Merou
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> 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 <peter@korsgaard.com>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-02-07 18:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-06 10:29 [Buildroot] [PATCH] package/gnuradio: simplify pyver logic Peter Korsgaard
2022-02-07 18:19 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.