Rebuilt and patched for Boost 1.73
This commit is contained in:
Jonathan Wakely
parent
562e4f234e
commit
745534ebab
|
|
@ -0,0 +1,182 @@
|
|||
--- uhd-3.15.0.0-rc2/host/cmake/Modules/UHDBoost.cmake~ 2020-06-03 14:17:53.758142936 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/cmake/Modules/UHDBoost.cmake 2020-06-03 14:17:55.821143050 +0100
|
||||
@@ -260,6 +260,9 @@
|
||||
# works for Boost 1.67.0 and newer & doesn't hurt older
|
||||
add_definitions(-DBOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW)
|
||||
|
||||
+ # Needed for Boost 1.73.0 to prevent warnings
|
||||
+ add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
|
||||
+
|
||||
# Boost 1.70.0's find cmake scripts don't always set the expected
|
||||
# return variables. Replicate the commit that fixes that issue here:
|
||||
# https://github.com/boostorg/boost_install/commit/cfa8d55250dfc2635e907e42da423e4eb540dee5
|
||||
--- uhd-3.15.0.0-rc2/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp~ 2020-06-03 14:27:43.441170397 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp 2020-06-03 14:27:48.015170596 +0100
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
using namespace uhd;
|
||||
using namespace uhd::rfnoc;
|
||||
+using namespace boost::placeholders;
|
||||
|
||||
class dma_fifo_block_ctrl_impl : public dma_fifo_block_ctrl
|
||||
{
|
||||
--- uhd-3.15.0.0-rc2/host/lib/usrp/multi_usrp.cpp~ 2020-06-03 14:28:32.297172502 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/lib/usrp/multi_usrp.cpp 2020-06-03 14:28:40.874172872 +0100
|
||||
@@ -31,6 +31,7 @@
|
||||
|
||||
using namespace uhd;
|
||||
using namespace uhd::usrp;
|
||||
+using namespace boost::placeholders;
|
||||
|
||||
const size_t multi_usrp::ALL_MBOARDS = size_t(~0);
|
||||
const size_t multi_usrp::ALL_CHANS = size_t(~0);
|
||||
--- uhd-3.15.0.0-rc2/host/lib/usrp/cores/rx_dsp_core_3000.cpp~ 2020-06-03 14:31:35.175180398 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/lib/usrp/cores/rx_dsp_core_3000.cpp 2020-06-03 14:31:42.021180693 +0100
|
||||
@@ -37,6 +37,7 @@
|
||||
}
|
||||
|
||||
using namespace uhd;
|
||||
+using namespace boost::placeholders;
|
||||
|
||||
const double rx_dsp_core_3000::DEFAULT_CORDIC_FREQ = 0.0;
|
||||
const double rx_dsp_core_3000::DEFAULT_RATE = 1e6;
|
||||
--- uhd-3.15.0.0-rc2/host/lib/usrp/cores/tx_dsp_core_3000.cpp~ 2020-06-03 14:32:19.984182329 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/lib/usrp/cores/tx_dsp_core_3000.cpp 2020-06-03 14:32:25.278182557 +0100
|
||||
@@ -28,6 +28,7 @@
|
||||
}
|
||||
|
||||
using namespace uhd;
|
||||
+using namespace boost::placeholders;
|
||||
|
||||
const double tx_dsp_core_3000::DEFAULT_CORDIC_FREQ = 0.0;
|
||||
const double tx_dsp_core_3000::DEFAULT_RATE = 1e6;
|
||||
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_cbx.cpp~ 2020-06-03 14:33:42.513185887 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_cbx.cpp 2020-06-03 14:33:44.167185959 +0100
|
||||
@@ -12,6 +12,7 @@
|
||||
using namespace uhd;
|
||||
using namespace uhd::usrp;
|
||||
using namespace boost::assign;
|
||||
+using namespace boost::placeholders;
|
||||
|
||||
/***********************************************************************
|
||||
* Structors
|
||||
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx2.cpp~ 2020-06-03 14:34:31.865188014 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx2.cpp 2020-06-03 14:34:38.007188279 +0100
|
||||
@@ -65,6 +65,7 @@
|
||||
using namespace uhd;
|
||||
using namespace uhd::usrp;
|
||||
using namespace boost::assign;
|
||||
+using namespace boost::placeholders;
|
||||
|
||||
/***********************************************************************
|
||||
* The TVRX2 types
|
||||
--- uhd-3.15.0.0-rc2/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp~ 2020-06-03 14:35:57.858191722 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp 2020-06-03 14:36:02.680191929 +0100
|
||||
@@ -27,6 +27,7 @@
|
||||
using namespace uhd::usrp;
|
||||
using namespace uhd::rfnoc;
|
||||
using namespace uhd::usrp::x300;
|
||||
+using namespace boost::placeholders;
|
||||
|
||||
static const size_t IO_MASTER_RADIO = 0;
|
||||
|
||||
--- uhd-3.15.0.0-rc2/host/lib/usrp/b100/b100_impl.cpp~ 2020-06-03 14:36:19.706192663 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/lib/usrp/b100/b100_impl.cpp 2020-06-03 14:36:25.680192921 +0100
|
||||
@@ -23,6 +23,7 @@
|
||||
using namespace uhd;
|
||||
using namespace uhd::usrp;
|
||||
using namespace uhd::transport;
|
||||
+using namespace boost::placeholders;
|
||||
|
||||
namespace {
|
||||
constexpr uint16_t B100_VENDOR_ID = 0x2500;
|
||||
--- uhd-3.15.0.0-rc2/host/lib/usrp_clock/octoclock/octoclock_impl.cpp~ 2020-06-03 14:36:54.427194160 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/lib/usrp_clock/octoclock/octoclock_impl.cpp 2020-06-03 14:37:11.471194895 +0100
|
||||
@@ -34,6 +34,7 @@
|
||||
using namespace uhd;
|
||||
using namespace uhd::usrp_clock;
|
||||
using namespace uhd::transport;
|
||||
+using namespace boost::placeholders;
|
||||
namespace asio = boost::asio;
|
||||
namespace fs = boost::filesystem;
|
||||
|
||||
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version4.cpp~ 2020-06-03 14:40:42.223206781 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version4.cpp 2020-06-03 14:40:49.140207195 +0100
|
||||
@@ -13,6 +13,7 @@
|
||||
using namespace uhd;
|
||||
using namespace uhd::usrp;
|
||||
using namespace boost::assign;
|
||||
+using namespace boost::placeholders;
|
||||
|
||||
/***********************************************************************
|
||||
* Structors
|
||||
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx2.cpp~ 2020-06-03 14:41:03.583208062 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx2.cpp 2020-06-03 14:41:12.806208613 +0100
|
||||
@@ -26,6 +26,7 @@
|
||||
using namespace uhd;
|
||||
using namespace uhd::usrp;
|
||||
using namespace boost::assign;
|
||||
+using namespace boost::placeholders;
|
||||
|
||||
/***********************************************************************
|
||||
* The DBSRX2 constants
|
||||
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx.cpp~ 2020-06-03 14:41:26.807209454 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx.cpp 2020-06-03 14:41:38.846210175 +0100
|
||||
@@ -41,6 +41,7 @@
|
||||
using namespace uhd;
|
||||
using namespace uhd::usrp;
|
||||
using namespace boost::assign;
|
||||
+using namespace boost::placeholders;
|
||||
|
||||
/***********************************************************************
|
||||
* The tvrx constants
|
||||
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx.cpp~ 2020-06-03 14:41:50.031210845 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx.cpp 2020-06-03 14:41:55.988211201 +0100
|
||||
@@ -31,6 +31,7 @@
|
||||
using namespace uhd;
|
||||
using namespace uhd::usrp;
|
||||
using namespace boost::assign;
|
||||
+using namespace boost::placeholders;
|
||||
|
||||
/***********************************************************************
|
||||
* The DBSRX constants
|
||||
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_common.cpp~ 2020-06-03 15:03:03.828285516 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_common.cpp 2020-06-03 15:03:06.925285692 +0100
|
||||
@@ -10,6 +10,7 @@
|
||||
using namespace uhd;
|
||||
using namespace uhd::usrp;
|
||||
using namespace boost::assign;
|
||||
+using namespace boost::placeholders;
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_xcvr2450.cpp~ 2020-06-03 15:03:37.135287400 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_xcvr2450.cpp 2020-06-03 15:03:46.203287915 +0100
|
||||
@@ -58,6 +58,7 @@
|
||||
using namespace uhd;
|
||||
using namespace uhd::usrp;
|
||||
using namespace boost::assign;
|
||||
+using namespace boost::placeholders;
|
||||
|
||||
/***********************************************************************
|
||||
* The XCVR 2450 constants
|
||||
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version3.cpp~ 2020-06-03 15:04:13.982289481 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version3.cpp 2020-06-03 15:04:21.595289912 +0100
|
||||
@@ -13,6 +13,7 @@
|
||||
using namespace uhd;
|
||||
using namespace uhd::usrp;
|
||||
using namespace boost::assign;
|
||||
+using namespace boost::placeholders;
|
||||
|
||||
/***********************************************************************
|
||||
* Structors
|
||||
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_ubx.cpp~ 2020-06-03 15:20:39.628345132 +0100
|
||||
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_ubx.cpp 2020-06-03 15:20:48.073345609 +0100
|
||||
@@ -30,6 +30,7 @@
|
||||
|
||||
using namespace uhd;
|
||||
using namespace uhd::usrp;
|
||||
+using namespace boost::placeholders;
|
||||
|
||||
/***********************************************************************
|
||||
* UBX Data Structures
|
||||
7
uhd.spec
7
uhd.spec
|
|
@ -32,7 +32,7 @@
|
|||
Name: uhd
|
||||
URL: http://github.com/EttusResearch/uhd
|
||||
Version: %{ver}
|
||||
Release: 0.4.rc2%{?dist}
|
||||
Release: 0.5.rc2%{?dist}
|
||||
License: GPLv3+
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
|
|
@ -53,6 +53,7 @@ Summary: Universal Hardware Driver for Ettus Research products
|
|||
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
|
||||
|
||||
%description
|
||||
The UHD is the universal hardware driver for Ettus Research products.
|
||||
|
|
@ -100,6 +101,7 @@ Wireshark dissector plugins.
|
|||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{ver}-rc2
|
||||
%patch0 -p1
|
||||
|
||||
# firmware
|
||||
%if %{with binary_firmware}
|
||||
|
|
@ -266,6 +268,9 @@ exit 0
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Jun 03 2020 Jonathan Wakely <jwakely@redhat.com> - 3.15.0.0-0.5.rc2
|
||||
- Rebuilt and patched for Boost 1.73
|
||||
|
||||
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.15.0.0-0.4.rc2
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue