[Buildroot] [PATCH v7 3/3] GNURadio: new package
Thomas Petazzoni
thomas.petazzoni at free-electrons.com
Fri Mar 13 21:53:38 UTC 2015
Dear Gwenhael Goavec-Merou,
On Fri, 13 Mar 2015 09:24:10 +0100, Gwenhael Goavec-Merou wrote:
> +Index: gnuradio-3.7.5/volk/cmake/VolkBoost.cmake
> +===================================================================
> +--- gnuradio-3.7.5.orig/volk/cmake/VolkBoost.cmake
> ++++ gnuradio-3.7.5/volk/cmake/VolkBoost.cmake
> +@@ -29,7 +29,6 @@ set(__INCLUDED_VOLK_BOOST_CMAKE TRUE)
> + set(BOOST_REQUIRED_COMPONENTS
> + filesystem
> + system
> +- unit_test_framework
It will probably be needed to re-add this unit_test_framework
dependency, but maybe only if BUILD_TEST is enabled, or something like
that.
> + program_options
> + )
> +
> +Index: gnuradio-3.7.5/volk/lib/CMakeLists.txt
> +===================================================================
> +--- gnuradio-3.7.5.orig/volk/lib/CMakeLists.txt
> ++++ gnuradio-3.7.5/volk/lib/CMakeLists.txt
> +@@ -540,8 +540,9 @@ endif(ENABLE_STATIC_LIBS)
> + # Build the QA test application
> + ########################################################################
> +
> ++find_package(Boost "1.35" COMPONENTS "unit_test_framework")
> +
> +-if(Boost_FOUND)
> ++if(Boost_FOUND AND BUILD_TEST)
> +
> + set_source_files_properties(
> + ${CMAKE_CURRENT_SOURCE_DIR}/testqa.cc PROPERTIES
> +@@ -558,4 +559,4 @@ if(Boost_FOUND)
> + target_link_libraries(test_all volk ${Boost_LIBRARIES})
> + add_test(qa_volk_test_all test_all)
> +
> +-endif(Boost_FOUND)
> ++endif(Boost_FOUND AND BUILD_TEST)
Can you please work with upstream to get this patch merged?
> +# host-python-cheetah is needed for volk to compile
> +GNURADIO_DEPENDENCIES = \
> + host-python-cheetah \
> + host-swig \
> + boost
Indentation should be only one tab.
> +GNURADIO_CONF_OPTS = \
> + -DENABLE_DEFAULT=OFF \
> + -DENABLE_VOLK=ON \
> + -DENABLE_GNURADIO_RUNTIME=ON
Ditto.
Committed with the indentation fixed.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
More information about the buildroot
mailing list