[Pkg-octave-commit] [SCM] Debian packaging for octave-nan branch, master, updated. debian/2.5.5-1-2-gf4609ad

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit ef735bd18719bfcf848477aecef22de8c9cf119a
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Mon Apr 23 22:45:47 2012 +0200

    hurd.patch: new patch
    
    Closes: #670073

diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
new file mode 100644
index 0000000..50dab66
--- /dev/null
+++ b/debian/patches/hurd.patch
@@ -0,0 +1,32 @@
+Description: Fix FTBFS and enable optimize byte swapping macros on hurd-i386
+ The problem is that octave-nan tries to include <machine/endian.h> if BSD is
+ defined (which is on Hurd, since it initially wanted to be BSD-compatible,
+ somehow). This patch avoids that #include in Hurd, and also enables
+ <byteswap.h> on any GNU libc platform (since GNU libc provides that header) to
+ have optimized byte swapping macros on GNU/Hurd and also on GNU/kFreeBSD too.
+Author: Pino Toscano <pino at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=670073
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_id=29169670
+Last-Update: 2012-04-23
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/xptopen.cpp
++++ b/src/xptopen.cpp
+@@ -72,7 +72,7 @@ SPSS file format
+ #define max(a,b)	(((a) > (b)) ? (a) : (b))
+ #define min(a,b)	(((a) < (b)) ? (a) : (b))
+ 
+-#ifdef __linux__
++#if defined(__linux__) || defined(__GLIBC__)
+ /* use byteswap macros from the host system, hopefully optimized ones ;-) */
+ #include <byteswap.h>
+ #endif
+@@ -83,7 +83,7 @@ SPSS file format
+ #define __BYTE_ORDER __LITTLE_ENDIAN
+ #endif
+ 
+-#if (defined(BSD) && (BSD >= 199103))
++#if ((defined(BSD) && !defined(__GNU__)) && (BSD >= 199103))
+ #include <machine/endian.h>
+ #define __BIG_ENDIAN _BIG_ENDIAN
+ #define __LITTLE_ENDIAN _LITTLE_ENDIAN
diff --git a/debian/patches/series b/debian/patches/series
index 22bc85f..1cf9bbc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_makefile
+hurd.patch

-- 
Debian packaging for octave-nan