[Pkg-octave-commit] [SCM] Debian packaging for octave-parallel branch, master, updated. debian/2.0.5-2-3-g46b5127

Rafael Laboissiere rafael at laboissiere.net
Wed Apr 4 04:49:11 UTC 2012


The following commit has been merged in the master branch:
commit 46b51273b6799d96ec66f65237b388a0c319e027
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Wed Apr 4 03:54:13 2012 +0200

    Fix FTBFS with g++ 4.7
    
    Closes: #667304

diff --git a/debian/patches/build-with-g++-4.7.patch b/debian/patches/build-with-g++-4.7.patch
new file mode 100644
index 0000000..4ee81a6
--- /dev/null
+++ b/debian/patches/build-with-g++-4.7.patch
@@ -0,0 +1,48 @@
+Description: Compile with g++-4.7
+ Include unistd.h and avoid the error about non declared functions like
+ read, write, usleep, etc.
+Author: Rafael Laboissiere <rafael at laboissiere.net>
+Last-Update: 2012-03-04
+
+--- octave-parallel-2.0.5.orig/src/connect.cc
++++ octave-parallel-2.0.5/src/connect.cc
+@@ -32,6 +32,8 @@ along with this program; If not, see <ht
+ 
+ #include "sock-stream.h"
+ 
++#include <unistd.h>
++
+ // COMM
+ 
+ static
+--- octave-parallel-2.0.5.orig/src/pserver.cc
++++ octave-parallel-2.0.5/src/pserver.cc
+@@ -39,6 +39,8 @@ along with this program; If not, see <ht
+ 
+ #include "config.h"
+ 
++#include <unistd.h>
++
+ #ifndef OCTAVE_LE_3_2_4
+ 
+ // Octave > 3.2.4 does not have these in a header file, but in
+--- octave-parallel-2.0.5.orig/src/recv.cc
++++ octave-parallel-2.0.5/src/recv.cc
+@@ -27,6 +27,7 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ 
++#include <unistd.h>
+ 
+ DEFUN_DLD (recv, args, nargout, "recv (socket)\n\
+ \n\
+--- octave-parallel-2.0.5.orig/src/send.cc
++++ octave-parallel-2.0.5/src/send.cc
+@@ -26,6 +26,7 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ 
++#include <unistd.h>
+ 
+ DEFUN_DLD (send, args, , "send (X, sockets)\n\
+ \n\
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f96efac
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+build-with-g++-4.7.patch

-- 
Debian packaging for octave-parallel



More information about the Pkg-octave-commit mailing list