Package: uhd-host Version: 3.7.0-1ap Severity: normal Tags: patch Hi,
The following patch allows uhd 3.7.0 (the latest current release) to compile against current Debian. This is useful for support of the USRP B200. -- System Information: Distributor ID: Ubuntu Description: Ubuntu 12.04.4 LTS Release: 12.04 Codename: precise Architecture: amd64 (x86_64) Kernel: Linux 3.8.11 (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages uhd-host depends on: ii adduser 3.113+nmu3 ii libboost-date-time1.54.0 1.54.0-4+b1 ii libboost-filesystem1.54.0 1.54.0-4+b1 ii libboost-program-options1.54.0 1.54.0-4+b1 ii libboost-regex1.54.0 1.54.0-4+b1 ii libboost-serialization1.54.0 1.54.0-4+b1 ii libboost-system1.54.0 1.54.0-4+b1 ii libboost-test1.54.0 1.54.0-4+b1 ii libboost-thread1.54.0 1.54.0-4+b1 ii libc6 2.18-1 ii libgcc1 1:4.8.2-16 ii libstdc++6 4.8.2-16 ii libuhd003 3.7.0-1ap ii libusb-1.0-0 2:1.0.17-1+b1 ii python 2.7.5-5 Versions of packages uhd-host recommends: ii curl 7.35.0-1 ii procps 1:3.3.9-3 ii python-tk 2.7.5-1 Versions of packages uhd-host suggests: ii gnuradio 3.7.2.1-5 -- no debconf information >From 05c7af8edefc970a0fd86596a3e0c93fc794c911 Mon Sep 17 00:00:00 2001 From: Avery Pennarun <apenw...@gmail.com> Date: Sat, 22 Feb 2014 18:48:47 -0800 Subject: [PATCH] Add some inttypes.h/stdint.h to workaround some boost versions. It's slightly inelegant to add these C-style includes, but they've been standardized for a long time. Sadly some versions of boost (including the one in current Debian) cannot compile this package unless these extra includes are added. --- host/include/uhd/types/serial.hpp | 1 + host/include/uhd/utils/msg_task.hpp | 1 + host/lib/usrp/x300/x300_regs.hpp | 2 ++ host/tests/time_spec_test.cpp | 1 + 4 files changed, 5 insertions(+) diff --git a/host/include/uhd/types/serial.hpp b/host/include/uhd/types/serial.hpp index 7b565c6..ab37773 100644 --- a/host/include/uhd/types/serial.hpp +++ b/host/include/uhd/types/serial.hpp @@ -18,6 +18,7 @@ #ifndef INCLUDED_UHD_TYPES_SERIAL_HPP #define INCLUDED_UHD_TYPES_SERIAL_HPP +#include <inttypes.h> #include <uhd/config.hpp> #include <boost/shared_ptr.hpp> #include <boost/cstdint.hpp> diff --git a/host/include/uhd/utils/msg_task.hpp b/host/include/uhd/utils/msg_task.hpp index 40ee65c..b79af56 100644 --- a/host/include/uhd/utils/msg_task.hpp +++ b/host/include/uhd/utils/msg_task.hpp @@ -18,6 +18,7 @@ #ifndef INCLUDED_UHD_UTILS_MSG_TASK_HPP #define INCLUDED_UHD_UTILS_MSG_TASK_HPP +#include <stdint.h> #include <uhd/config.hpp> #include <uhd/transport/zero_copy.hpp> #include <boost/shared_ptr.hpp> diff --git a/host/lib/usrp/x300/x300_regs.hpp b/host/lib/usrp/x300/x300_regs.hpp index e4ae76a..c0bb565 100644 --- a/host/lib/usrp/x300/x300_regs.hpp +++ b/host/lib/usrp/x300/x300_regs.hpp @@ -18,6 +18,8 @@ #ifndef INCLUDED_X300_REGS_HPP #define INCLUDED_X300_REGS_HPP +#include <stdint.h> +#include <inttypes.h> #include <boost/cstdint.hpp> #define TOREG(x) ((x)*4) diff --git a/host/tests/time_spec_test.cpp b/host/tests/time_spec_test.cpp index c9b9652..247a3ec 100644 --- a/host/tests/time_spec_test.cpp +++ b/host/tests/time_spec_test.cpp @@ -15,6 +15,7 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. // +#include <inttypes.h> #include <boost/test/unit_test.hpp> #include <uhd/types/time_spec.hpp> #include <boost/foreach.hpp> -- 1.9.0
>From 05c7af8edefc970a0fd86596a3e0c93fc794c911 Mon Sep 17 00:00:00 2001 From: Avery Pennarun <apenw...@gmail.com> Date: Sat, 22 Feb 2014 18:48:47 -0800 Subject: [PATCH] Add some inttypes.h/stdint.h to workaround some boost versions. It's slightly inelegant to add these C-style includes, but they've been standardized for a long time. Sadly some versions of boost (including the one in current Debian) cannot compile this package unless these extra includes are added. --- host/include/uhd/types/serial.hpp | 1 + host/include/uhd/utils/msg_task.hpp | 1 + host/lib/usrp/x300/x300_regs.hpp | 2 ++ host/tests/time_spec_test.cpp | 1 + 4 files changed, 5 insertions(+) diff --git a/host/include/uhd/types/serial.hpp b/host/include/uhd/types/serial.hpp index 7b565c6..ab37773 100644 --- a/host/include/uhd/types/serial.hpp +++ b/host/include/uhd/types/serial.hpp @@ -18,6 +18,7 @@ #ifndef INCLUDED_UHD_TYPES_SERIAL_HPP #define INCLUDED_UHD_TYPES_SERIAL_HPP +#include <inttypes.h> #include <uhd/config.hpp> #include <boost/shared_ptr.hpp> #include <boost/cstdint.hpp> diff --git a/host/include/uhd/utils/msg_task.hpp b/host/include/uhd/utils/msg_task.hpp index 40ee65c..b79af56 100644 --- a/host/include/uhd/utils/msg_task.hpp +++ b/host/include/uhd/utils/msg_task.hpp @@ -18,6 +18,7 @@ #ifndef INCLUDED_UHD_UTILS_MSG_TASK_HPP #define INCLUDED_UHD_UTILS_MSG_TASK_HPP +#include <stdint.h> #include <uhd/config.hpp> #include <uhd/transport/zero_copy.hpp> #include <boost/shared_ptr.hpp> diff --git a/host/lib/usrp/x300/x300_regs.hpp b/host/lib/usrp/x300/x300_regs.hpp index e4ae76a..c0bb565 100644 --- a/host/lib/usrp/x300/x300_regs.hpp +++ b/host/lib/usrp/x300/x300_regs.hpp @@ -18,6 +18,8 @@ #ifndef INCLUDED_X300_REGS_HPP #define INCLUDED_X300_REGS_HPP +#include <stdint.h> +#include <inttypes.h> #include <boost/cstdint.hpp> #define TOREG(x) ((x)*4) diff --git a/host/tests/time_spec_test.cpp b/host/tests/time_spec_test.cpp index c9b9652..247a3ec 100644 --- a/host/tests/time_spec_test.cpp +++ b/host/tests/time_spec_test.cpp @@ -15,6 +15,7 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. // +#include <inttypes.h> #include <boost/test/unit_test.hpp> #include <uhd/types/time_spec.hpp> #include <boost/foreach.hpp> -- 1.9.0
