| 1 |
commit: e05c0d5549b494c5e4667b0701275b094d46c972 |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Oct 15 23:55:09 2017 +0000 |
| 4 |
Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 16 01:13:38 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e05c0d55 |
| 7 |
|
| 8 |
net-wireless/uhd: Fix building with GCC-6 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/611680 |
| 11 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
| 12 |
|
| 13 |
net-wireless/uhd/files/uhd-3.8.5-gcc6.patch | 25 +++++++++++++++++++++++++ |
| 14 |
net-wireless/uhd/uhd-3.8.5.ebuild | 4 ++++ |
| 15 |
net-wireless/uhd/uhd-3.9.6.ebuild | 2 ++ |
| 16 |
3 files changed, 31 insertions(+) |
| 17 |
|
| 18 |
diff --git a/net-wireless/uhd/files/uhd-3.8.5-gcc6.patch b/net-wireless/uhd/files/uhd-3.8.5-gcc6.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..c2e5e00f70d |
| 21 |
--- /dev/null |
| 22 |
+++ b/net-wireless/uhd/files/uhd-3.8.5-gcc6.patch |
| 23 |
@@ -0,0 +1,25 @@ |
| 24 |
+Bug: https://bugs.gentoo.org/611680 |
| 25 |
+Backported from: https://github.com/EttusResearch/uhd/commit/b6ad4c0531ef56f4e197cccd06f1d11fc89e4aab |
| 26 |
+ |
| 27 |
+--- a/host/lib/usrp/dboard/db_cbx.cpp |
| 28 |
++++ b/host/lib/usrp/dboard/db_cbx.cpp |
| 29 |
+@@ -38,7 +38,7 @@ sbx_xcvr::cbx::~cbx(void){ |
| 30 |
+ /* NOP */ |
| 31 |
+ } |
| 32 |
+ |
| 33 |
+-void sbx_xcvr::cbx::write_lo_regs(dboard_iface::unit_t unit, std::vector<boost::uint32_t> ®s) |
| 34 |
++void sbx_xcvr::cbx::write_lo_regs(dboard_iface::unit_t unit, const std::vector<boost::uint32_t> ®s) |
| 35 |
+ { |
| 36 |
+ BOOST_FOREACH(boost::uint32_t reg, regs) |
| 37 |
+ { |
| 38 |
+--- a/host/lib/usrp/dboard/db_sbx_common.hpp |
| 39 |
++++ b/host/lib/usrp/dboard/db_sbx_common.hpp |
| 40 |
+@@ -225,7 +225,7 @@ class sbx_xcvr : public xcvr_dboard_base{ |
| 41 |
+ /*! This is the registered instance of the wrapper class, sbx_base. */ |
| 42 |
+ sbx_xcvr *self_base; |
| 43 |
+ private: |
| 44 |
+- void write_lo_regs(dboard_iface::unit_t unit, std::vector<boost::uint32_t> ®s); |
| 45 |
++ void write_lo_regs(dboard_iface::unit_t unit, const std::vector<boost::uint32_t> ®s); |
| 46 |
+ max287x_iface::sptr _txlo; |
| 47 |
+ max287x_iface::sptr _rxlo; |
| 48 |
+ }; |
| 49 |
|
| 50 |
diff --git a/net-wireless/uhd/uhd-3.8.5.ebuild b/net-wireless/uhd/uhd-3.8.5.ebuild |
| 51 |
index 1474f296e8c..d6787b88c5f 100644 |
| 52 |
--- a/net-wireless/uhd/uhd-3.8.5.ebuild |
| 53 |
+++ b/net-wireless/uhd/uhd-3.8.5.ebuild |
| 54 |
@@ -34,7 +34,11 @@ DEPEND="${RDEPEND} |
| 55 |
|
| 56 |
S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host |
| 57 |
|
| 58 |
+PATCHES=( "${FILESDIR}"/${P}-gcc6.patch ) |
| 59 |
+ |
| 60 |
src_prepare() { |
| 61 |
+ cmake-utils_src_prepare |
| 62 |
+ |
| 63 |
gnome2_environment_reset #534582 |
| 64 |
|
| 65 |
#this may not be needed in 3.4.3 and above, please verify |
| 66 |
|
| 67 |
diff --git a/net-wireless/uhd/uhd-3.9.6.ebuild b/net-wireless/uhd/uhd-3.9.6.ebuild |
| 68 |
index f1f73a61caf..57e30328555 100644 |
| 69 |
--- a/net-wireless/uhd/uhd-3.9.6.ebuild |
| 70 |
+++ b/net-wireless/uhd/uhd-3.9.6.ebuild |
| 71 |
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND} |
| 72 |
S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host |
| 73 |
|
| 74 |
src_prepare() { |
| 75 |
+ cmake-utils_src_prepare |
| 76 |
+ |
| 77 |
gnome2_environment_reset #534582 |
| 78 |
|
| 79 |
#this may not be needed in 3.4.3 and above, please verify |
Archives