package/uhd: new package
PATCH 1/1 package/uhd: new package
From: Gwenhael Goavec-Merou <[email protected]>
Signed-off-by Gwenhael Goavec-Merou <[email protected]>
--- DEVELOPERS | 1 + package/Config.in | 1 + ...add-boost-unit_test_framework-requir.patch | 40 ++ .../uhd/0002-host-fix-build-boost-173.patch | 577 ++++++++++++++++++ package/uhd/Config.in | 75 +++ package/uhd/uhd.hash | 4 + package/uhd/uhd.mk | 94 +++ 7 files changed, 792 insertions(+) create mode 100644 package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch create mode 100644 package/uhd/0002-host-fix-build-boost-173.patch create mode 100644 package/uhd/Config.in create mode 100644 package/uhd/uhd.hash create mode 100644 package/uhd/uhd.mk
DEVELOPERS +1 -0
@@ -1094,6 +1094,7 @@ F: package/python-cheetah/ F: package/python-markdown/ F: package/python-remi/ F: package/python-sip/ +F: package/uhd/ N: Heiko Thiery <[email protected]> F: package/libnetconf2/
package/Config.in +1 -0
@@ -1533,6 +1533,7 @@ menu "Hardware handling" source "package/owfs/Config.in" source "package/pcsc-lite/Config.in" source "package/tslib/Config.in" + source "package/uhd/Config.in" source "package/urg/Config.in" endmenu
package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch new file +40 -0
@@ -0,0 +1,40 @@ +From 881705ec581ab7cd61c8e4fe134db8854a83ec4e Mon Sep 17 00:00:00 2001 +From: Gwenhael Goavec-Merou <[email protected]> +Date: Tue, 28 Apr 2020 16:56:29 +0200 +Subject: [PATCH] host: CMakeLists: add boost unit_test_framework required only + when ENABLE_TESTS=ON + +By default, boost unit_test_framework is always required, but only use +when ENABLE_TESTS=ON. +This PR suppress unit_test_framework to the default list and append +UHD_BOOST_REQUIRED_COMPONENTS when this library is needed + +[backported from https://github.com/EttusResearch/uhd/pull/341] +Signed-off-by: Gwenhael Goavec-Merou <[email protected]> +--- + host/CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt +index 8f72ece76..a7731ffbd 100644 +--- a/host/CMakeLists.txt ++++ b/host/CMakeLists.txt +@@ -291,10 +291,14 @@ set(UHD_BOOST_REQUIRED_COMPONENTS + filesystem + program_options + system +- unit_test_framework + serialization + thread + ) ++ ++if(ENABLE_TESTS) ++ list(APPEND UHD_BOOST_REQUIRED_COMPONENTS unit_test_framework) ++endif(ENABLE_TESTS) ++ + include(UHDBoost) + + include_directories(${Boost_INCLUDE_DIRS}) +-- +2.26.2 +
package/uhd/0002-host-fix-build-boost-173.patch new file +577 -0
577 lines not on this page · raw message
package/uhd/Config.in new file +75 -0
75 lines not on this page · raw message
package/uhd/uhd.hash new file +4 -0
@@ -0,0 +1,4 @@ +# Locally calculated: +sha256 eed4a77d75faafff56be78985950039f8d9d1eb9fcbd58b8862e481dd49825cd uhd-3.15.0.0.tar.gz +sha256 8fc99820c2419d0de6bbbd319ff935d54960b37b716d0b4bb1c75de493f3e1fd LICENSE.md +sha256 70bf7e79c8cd73a81f97ce81745ea0719a617eebe299a61868165daeae71fff2 host/LICENSE
package/uhd/uhd.mk new file +94 -0
94 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 1/1 package/uhd: new package
Quoted 3 lines · On Mon, 24 Aug 2020 14:02:46 +0200 Gwenhael Goavec-Merou…
From: Gwenhael Goavec-Merou <[email protected]>
Signed-off-by Gwenhael Goavec-Merou <[email protected]>
Thanks, I've applied to next. Two nits below.
Quoted 7 lines
package/uhd/Config.in new file +7
-0+config BR2_PACKAGE_UHD + bool "uhd" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_USE_MMU # use fork() + depends on BR2_USE_WCHAR # boost
package/uhd/Config.in line 22
Quoted 10 lines
package/uhd/Config.in new file +10
-0+ select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_CHRONO + select BR2_PACKAGE_BOOST_DATE_TIME + select BR2_PACKAGE_BOOST_FILESYSTEM + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS + select BR2_PACKAGE_BOOST_REGEX + select BR2_PACKAGE_BOOST_SERIALIZATION + select BR2_PACKAGE_BOOST_SYSTEM + select BR2_PACKAGE_BOOST_THREAD + select BR2_PACKAGE_BOOST_ATOMIC
Alphabetic ordering was not perfect here :-)
Quoted 1 line
+UHD_LICENSE_FILES = LICENSE.md output/LICENSE
output/LICENSE does not exist, it is host/LICENSE
I fixed those small nits when applying. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com