From 7050140f23655511bb219c3a9829846ffb6123c5 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Tue, 8 Feb 2022 17:24:09 +0100 Subject: [PATCH] package/gnuradio: use external volk instead of the internal one Until recent releases GNURadio was shipped with volk as a submodule. Even though we still use 3.8.x, with the newer 3.9 and 3.10, volk is no longer available as a submodule, and it is needed to build it separately. In order to prepare for this, this patch disable the internal volk, and adds a dependency to the corresponding package, to use unconditionnaly the one built by Buildroot. Signed-off-by: Gwenhael Goavec-Merou Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/gnuradio/Config.in | 1 + package/gnuradio/gnuradio.mk | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 1896d1326a..103175946c 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -28,6 +28,7 @@ config BR2_PACKAGE_GNURADIO select BR2_PACKAGE_BOOST_THREAD select BR2_PACKAGE_LOG4CPP select BR2_PACKAGE_GMP + select BR2_PACKAGE_VOLK help GNU Radio is a free & open-source software development toolkit that provides signal processing blocks to implement diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 49e3b95191..e36dce081c 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -19,13 +19,15 @@ GNURADIO_DEPENDENCIES = \ host-swig \ boost \ log4cpp \ - gmp + gmp \ + volk GNURADIO_CONF_OPTS = \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DENABLE_DEFAULT=OFF \ -DENABLE_VOLK=ON \ -DENABLE_GNURADIO_RUNTIME=ON \ + -DENABLE_INTERNAL_VOLK=OFF \ -DENABLE_TESTING=OFF \ -DXMLTO_EXECUTABLE=NOTFOUND