rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to 2019.02

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
bsp/buildroot/package/gnuradio/0001-suppress-boost_unitest-detection.patch
View File

@@ -1,41 +0,0 @@
By default, the boost test option is mandatory for build environment
detection.
This patch suppress this dependency and allows the test part only if
build_test is enabled at the Buildroot level.
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
---
Index: gnuradio-3.7.5/volk/cmake/VolkBoost.cmake
===================================================================
--- gnuradio-3.7.5.orig/volk/cmake/Modules/VolkBoost.cmake
+++ gnuradio-3.7.5/volk/cmake/Modules/VolkBoost.cmake
@@ -29,7 +29,6 @@ set(__INCLUDED_VOLK_BOOST_CMAKE TRUE)
set(BOOST_REQUIRED_COMPONENTS
filesystem
system
- unit_test_framework
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
@@ -580,7 +580,10 @@
########################################################################
# Build the QA test application
########################################################################
-if(ENABLE_TESTING)
+
+find_package(Boost "1.35" COMPONENTS "unit_test_framework")
+
+if(ENABLE_TESTING AND BUILD_TEST)
#include Boost headers
include_directories(${Boost_INCLUDE_DIRS})
@@ -597,4 +600,4 @@
TARGET_DEPS volk
)
-endif(ENABLE_TESTING)
+endif(ENABLE_TESTING AND BUILD_TEST)

25
bsp/buildroot/package/gnuradio/Config.in
View File

@@ -1,5 +1,6 @@
comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library"
depends on BR2_USE_MMU
depends on !BR2_PACKAGE_PYTHON3
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
@@ -10,6 +11,7 @@ config BR2_PACKAGE_GNURADIO
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on BR2_USE_MMU # use fork()
depends on BR2_USE_WCHAR # boost
depends on !BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_BOOST
select BR2_PACKAGE_BOOST_DATE_TIME
select BR2_PACKAGE_BOOST_FILESYSTEM
@@ -69,10 +71,12 @@ config BR2_PACKAGE_GNURADIO_UTILS
help
Misc python utilities
comment "gr-fft, -filter, -analog, -channels, -digital, -trellis, -pager, -qtgui depends fftw's single precision"
depends on !BR2_PACKAGE_FFTW_PRECISION_SINGLE
if BR2_PACKAGE_FFTW_PRECISION_SINGLE
config BR2_PACKAGE_GNURADIO_ZEROMQ
bool "gr-zeromq support"
select BR2_PACKAGE_CPPZMQ
select BR2_PACKAGE_PYTHON_PYZMQ if BR2_PACKAGE_GNURADIO_PYTHON
help
zeromq communication support
config BR2_PACKAGE_GNURADIO_ANALOG
bool "gr-analog support"
@@ -94,6 +98,8 @@ config BR2_PACKAGE_GNURADIO_DIGITAL
config BR2_PACKAGE_GNURADIO_FFT
bool "gr-fft support"
select BR2_PACKAGE_FFTW
select BR2_PACKAGE_FFTW_SINGLE
select BR2_PACKAGE_GNURADIO_BLOCKS
help
FFT signal processing blocks
@@ -110,16 +116,6 @@ config BR2_PACKAGE_GNURADIO_PAGER
help
FLEX pager decoder implementation blocks
config BR2_PACKAGE_GNURADIO_QTGUI
bool "gr-qtgui"
depends on BR2_PACKAGE_PYTHON_PYQT
depends on BR2_PACKAGE_QWT
depends on BR2_PACKAGE_QT_STL
select BR2_PACKAGE_GNURADIO_FFT
select BR2_PACKAGE_GNURADIO_FILTER
help
GNU Radio Qt scopes
config BR2_PACKAGE_GNURADIO_TRELLIS
bool "gr-trellis support"
select BR2_PACKAGE_GNURADIO_DIGITAL
@@ -127,4 +123,3 @@ config BR2_PACKAGE_GNURADIO_TRELLIS
Trellis coded modulation blocks
endif
endif

5
bsp/buildroot/package/gnuradio/gnuradio.hash
View File

@@ -1,2 +1,5 @@
# From http://gnuradio.org/releases/gnuradio/sha256sums
sha256 87d9ba3183858efdbb237add3f9de40f7d65f25e16904a9bc8d764a7287252d4 gnuradio-3.7.11.tar.gz
sha256 1e07ce40fa3c3eede1fb54e320dad8a221a3c01de341e9cef2d7b265ed06a6e9 gnuradio-3.7.13.3.tar.gz
# Hash for license file:
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING

30
bsp/buildroot/package/gnuradio/gnuradio.mk
View File

@@ -4,16 +4,17 @@
#
################################################################################
GNURADIO_VERSION = 3.7.11
GNURADIO_VERSION = 3.7.13.3
GNURADIO_SITE = http://gnuradio.org/releases/gnuradio
GNURADIO_LICENSE = GPL-3.0+
GNURADIO_LICENSE_FILES = COPYING
GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO
# host-python-cheetah is needed for volk to compile
# host-python-mako and host-python-six are needed for volk to compile
GNURADIO_DEPENDENCIES = \
host-python-cheetah \
host-python-mako \
host-python-six \
host-swig \
boost
@@ -24,7 +25,9 @@ endif
GNURADIO_CONF_OPTS = \
-DENABLE_DEFAULT=OFF \
-DENABLE_VOLK=ON \
-DENABLE_GNURADIO_RUNTIME=ON
-DENABLE_GNURADIO_RUNTIME=ON \
-DENABLE_GR_QTGUI=OFF \
-DXMLTO_EXECUTABLE=NOTFOUND
# For third-party blocks, the gnuradio libraries are mandatory at
# compile time.
@@ -100,7 +103,7 @@ GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=OFF
endif
ifeq ($(BR2_PACKAGE_GNURADIO_FFT),y)
GNURADIO_DEPENDENCIES += fftw
GNURADIO_DEPENDENCIES += fftw-single
GNURADIO_CONF_OPTS += -DENABLE_GR_FFT=ON
else
GNURADIO_CONF_OPTS += -DENABLE_GR_FFT=OFF
@@ -125,13 +128,6 @@ else
GNURADIO_CONF_OPTS += -DENABLE_PAGER=OFF
endif
ifeq ($(BR2_PACKAGE_GNURADIO_QTGUI),y)
GNURADIO_DEPENDENCIES += python-pyqt qwt
GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=ON
else
GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=OFF
endif
ifeq ($(BR2_PACKAGE_GNURADIO_TRELLIS),y)
GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=ON
else
@@ -144,4 +140,14 @@ else
GNURADIO_CONF_OPTS += -DENABLE_GR_UTILS=OFF
endif
ifeq ($(BR2_PACKAGE_GNURADIO_ZEROMQ),y)
GNURADIO_DEPENDENCIES += cppzmq
ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y)
GNURADIO_DEPENDENCIES += python-pyzmq
endif
GNURADIO_CONF_OPTS += -DENABLE_GR_ZEROMQ=ON
else
GNURADIO_CONF_OPTS += -DENABLE_GR_ZEROMQ=OFF
endif
$(eval $(cmake-package))