rpms
/
uhd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing #includes for gcc-11

This commit is contained in:
Jeff Law 2020-12-04 21:03:00 -07:00
parent 11aa984027
commit c31974efbc
2 changed files with 234 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

228
uhd-gcc11.patch Normal file
View File

@ -0,0 +1,228 @@
diff --git a/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp
index 3356510..55a8981 100644
--- a/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp
+++ b/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp
@@ -4,6 +4,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <thread>
#include "e31x_radio_ctrl_impl.hpp"
#include "e31x_regs.hpp"
diff --git a/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp
index c48cabc..0771aa0 100644
--- a/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp
+++ b/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp
@@ -4,6 +4,8 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <thread>
+
#include "e320_radio_ctrl_impl.hpp"
#include "e320_regs.hpp"
diff --git a/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp b/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp
index d9cadc8..155a075 100644
--- a/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp
+++ b/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp
@@ -4,6 +4,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <thread>
#include "e3xx_ad9361_iface.hpp"
#include <uhd/exception.hpp>
#include <uhd/utils/log.hpp>
diff --git a/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp b/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp
index 001cf5d..c13b7e8 100644
--- a/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp
+++ b/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp
@@ -4,6 +4,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <thread>
#include "e3xx_constants.hpp"
#include "e3xx_radio_ctrl_impl.hpp"
#include <uhd/utils/math.hpp>
diff --git a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp
index 989b73b..587ef6d 100644
--- a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp
+++ b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp
@@ -4,6 +4,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <thread>
#include "e3xx_radio_ctrl_impl.hpp"
#include "e3xx_constants.hpp"
#include <uhd/rfnoc/node_ctrl_base.hpp>
diff --git a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp
index 5b33b33..bd5aac1 100644
--- a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp
+++ b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp
@@ -4,6 +4,9 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <thread>
+#include <stdexcept>
+
#include "e3xx_constants.hpp"
#include "e3xx_radio_ctrl_impl.hpp"
#include <uhd/transport/chdr.hpp>
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp b/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp
index d7d1b43..d1308d1 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp
@@ -4,6 +4,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <thread>
#include "magnesium_ad9371_iface.hpp"
#include "magnesium_constants.hpp"
#include <uhd/utils/log.hpp>
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp b/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp
index 13cc52d..1bd71ae 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp
@@ -6,6 +6,7 @@
// The band plan
+#include <thread>
#include "magnesium_constants.hpp"
#include "magnesium_radio_ctrl_impl.hpp"
#include <uhd/utils/math.hpp>
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp b/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp
index 67b20f5..7963153 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp
@@ -4,6 +4,8 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <thread>
+
#include "magnesium_gain_table.hpp"
#include "magnesium_constants.hpp"
#include <uhd/exception.hpp>
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp
index 679816a..26bf5fd 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp
@@ -4,6 +4,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <thread>
#include "magnesium_constants.hpp"
#include "magnesium_cpld_ctrl.hpp"
#include "magnesium_radio_ctrl_impl.hpp"
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp
index b66bd2e..041d651 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp
@@ -4,6 +4,8 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <thread>
+
#include "magnesium_constants.hpp"
#include "magnesium_gain_table.hpp"
#include "magnesium_radio_ctrl_impl.hpp"
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp
index 405d595..5d3964b 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp
@@ -4,6 +4,8 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <thread>
+
#include "magnesium_radio_ctrl_impl.hpp"
#include "magnesium_constants.hpp"
#include "magnesium_gain_table.hpp"
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp
index 89db614..893741c 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp
@@ -4,6 +4,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <thread>
#include "magnesium_constants.hpp"
#include "magnesium_radio_ctrl_impl.hpp"
#include <uhd/transport/chdr.hpp>
diff --git a/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp b/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp
index ffa2061..eb3c1cf 100644
--- a/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp
+++ b/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp
@@ -4,6 +4,8 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <thread>
+
#include "rhodium_radio_ctrl_impl.hpp"
#include "rhodium_constants.hpp"
#include <uhd/utils/math.hpp>
diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp
index 846a4ea..450c16c 100644
--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp
+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp
@@ -4,6 +4,8 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <thread>
+
#include "rhodium_radio_ctrl_impl.hpp"
#include "rhodium_cpld_ctrl.hpp"
#include "rhodium_constants.hpp"
diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp
index d6dbbc5..40e4c9c 100644
--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp
+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp
@@ -4,6 +4,9 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <thread>
+#include <stdexcept>
+
#include "rhodium_radio_ctrl_impl.hpp"
#include "rhodium_constants.hpp"
#include <uhdlib/utils/narrow.hpp>
diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp
index 356932b..8420756 100644
--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp
+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp
@@ -4,6 +4,8 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <thread>
+
#include "rhodium_radio_ctrl_impl.hpp"
#include "rhodium_constants.hpp"
#include <uhdlib/usrp/cores/spi_core_3000.hpp>
diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp
index 4058624..f81a855 100644
--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp
+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp
@@ -4,6 +4,8 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <thread>
+
#include "rhodium_radio_ctrl_impl.hpp"
#include "rhodium_constants.hpp"
#include <uhdlib/utils/narrow.hpp>

7
uhd.spec
View File

@ -32,7 +32,7 @@
Name: uhd
URL: http://github.com/EttusResearch/uhd
Version: %{ver}
Release: 0.8.rc2%{?dist}
Release: 0.9.rc2%{?dist}
License: GPLv3+
BuildRequires: gcc-c++
BuildRequires: cmake
@ -54,6 +54,7 @@ Source0: %{url}/archive/v%{ver}-rc2/uhd-%{ver}-rc2.tar.gz
Source1: %{name}-limits.conf
Source2: %{url}/releases/download/v%{verd}/uhd-images_%{verd}.tar.xz
Patch0: %{name}-bind-placeholders.patch
Patch1: %{name}-gcc11.patch
%description
The UHD is the universal hardware driver for Ettus Research products.
@ -102,6 +103,7 @@ Wireshark dissector plugins.
%prep
%setup -q -n %{name}-%{ver}-rc2
%patch0 -p1
%patch1 -p1
# firmware
%if %{with binary_firmware}
@ -266,6 +268,9 @@ exit 0
%endif
%changelog
* Fri Dec 4 2020 Jeff Law <law@redhat.com> - 3.15.0.0-0.9.rc2
- Fix missing #includes for gcc-11
* Wed Aug 5 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 3.15.0.0-0.8.rc2
- Fixed FTBFS
Resolves: rhbz#1865590