[ros-ros-comm] 01/02: Add patch for BSD

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke pushed a commit to branch master
in repository ros-ros-comm.

commit 18a65c76336b5c8575fe0bbd5828f8ad0dc10097
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Sep 26 10:54:25 2017 +0200

    Add patch for BSD
    
    Closes: #876747
---
 ...7-Don-t-try-to-set-unknown-socket-options.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 23 insertions(+)

diff --git a/debian/patches/0007-Don-t-try-to-set-unknown-socket-options.patch b/debian/patches/0007-Don-t-try-to-set-unknown-socket-options.patch
new file mode 100644
index 0000000..c6acdc6
--- /dev/null
+++ b/debian/patches/0007-Don-t-try-to-set-unknown-socket-options.patch
@@ -0,0 +1,22 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 26 Sep 2017 10:53:26 +0200
+Subject: Don't try to set unknown socket options
+
+These are not avaible on FreeBSD, for example
+---
+ clients/roscpp/src/libros/transport/transport_tcp.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clients/roscpp/src/libros/transport/transport_tcp.cpp b/clients/roscpp/src/libros/transport/transport_tcp.cpp
+index 9605dbb..cea4318 100644
+--- a/clients/roscpp/src/libros/transport/transport_tcp.cpp
++++ b/clients/roscpp/src/libros/transport/transport_tcp.cpp
+@@ -179,7 +179,7 @@ void TransportTCP::setKeepAlive(bool use, uint32_t idle, uint32_t interval, uint
+     }
+ 
+ /* cygwin SOL_TCP does not seem to support TCP_KEEPIDLE, TCP_KEEPINTVL, TCP_KEEPCNT */
+-#if defined(SOL_TCP) && !defined(__CYGWIN__)
++#if defined(SOL_TCP) && !defined(__CYGWIN__) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) && defined(TCP_KEEPCNT)
+     val = idle;
+     if (setsockopt(sock_, SOL_TCP, TCP_KEEPIDLE, &val, sizeof(val)) != 0)
+     {
diff --git a/debian/patches/series b/debian/patches/series
index 1981c29..2c414dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-Fix-executable-not-elf-or-script.patch
 0005-Add-defaults-to-roswtf.patch
 0006-Use-system-libb64.patch
+0007-Don-t-try-to-set-unknown-socket-options.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-ros-comm.git