diff --git a/uhd-boost169.patch b/uhd-boost169.patch new file mode 100644 index 0000000..c2a36b0 --- /dev/null +++ b/uhd-boost169.patch @@ -0,0 +1,75 @@ +From 5c012cad7858cadcaa85ec295080f3c8b21fdee0 Mon Sep 17 00:00:00 2001 +From: Martin Braun +Date: Wed, 9 Jan 2019 09:17:07 -0800 +Subject: [PATCH] lib: experts: Add potentially missing but sometimes inferred + include + +This adds an include for boost/core/noncopyable.hpp. Without it, builds +would potentially fail on Boost 1.69++. +--- + host/lib/include/uhdlib/experts/expert_nodes.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp +index 697ca19c3..8fa183835 100644 +--- a/host/lib/include/uhdlib/experts/expert_nodes.hpp ++++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include + #include + +From f1d6d1e480ca873259c816c0bd2dac5eb7aecd5a Mon Sep 17 00:00:00 2001 +From: Martin Braun +Date: Wed, 9 Jan 2019 16:24:01 -0800 +Subject: [PATCH] lib: experts: fixup for including Boost header + +Header wasn't included until Boost 1.56. + +Fixes 5c012cad7858 ("lib: experts: Add potentially missing but...") +--- + host/lib/include/uhdlib/experts/expert_nodes.hpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp +index 8fa183835..a540fc49d 100644 +--- a/host/lib/include/uhdlib/experts/expert_nodes.hpp ++++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp +@@ -12,7 +12,9 @@ + #include + #include + #include ++#if BOOST_VERSION >= 105600 + #include ++#endif + #include + #include + #include + +From 66df76097953ecd3ea7e0154049da949f2306743 Mon Sep 17 00:00:00 2001 +From: Martin Braun +Date: Mon, 14 Jan 2019 13:34:13 -0800 +Subject: [PATCH] includes: Make sure BOOST_VERSION is always available + +Boost changed the includes, and boost/version.hpp was being implicitly +imported. This makes the include explicit. +--- + host/include/uhd/config.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp +index 0f619c94a..e7b48e5d8 100644 +--- a/host/include/uhd/config.hpp ++++ b/host/include/uhd/config.hpp +@@ -9,6 +9,7 @@ + #define INCLUDED_UHD_CONFIG_HPP + + #include ++#include + + #ifdef BOOST_MSVC + // suppress warnings diff --git a/uhd.spec b/uhd.spec index eee8bd2..6c2f202 100644 --- a/uhd.spec +++ b/uhd.spec @@ -35,6 +35,8 @@ Summary: Universal Hardware Driver for Ettus Research products Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{version}/uhd-images_%{version}.tar.xz +# Patches for Boost 1.69 support https://github.com/EttusResearch/uhd/pull/248 +Patch0: %{name}-boost169.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -80,6 +82,7 @@ Wireshark dissector plugins. %prep %setup -q +%patch0 -p1 # firmware %if %{with binary_firmware} @@ -227,6 +230,9 @@ mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark %{_libdir}/wireshark/plugins/* %changelog +* Tue Jan 29 2019 Jonathan Wakely - 3.12.0.0-3 +- Add upstream patches for Boost 1.69.0 header changes + * Fri Jan 25 2019 Jonathan Wakely - 3.12.0.0-3 - Rebuilt for Boost 1.69