[adios] 40/207: Hurd fix

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository adios.

commit 2bde0f66778bf1354a02806611e6d63b63594f2b
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Mar 9 16:24:05 2012 +0000

    Hurd fix
---
 debian/changelog           |  1 +
 debian/patches/errno.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 46 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1a26c9c..7d6252b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ adios (1.3-9) unstable; urgency=low
 
   * Move to Standards-Version: 3.9.3. No changes required.
   * Fixes to build with hardening flags.  
+  * Patch from Pino Toscano to fix FTBFS on Hurd. Closes: #660562.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Mon, 05 Mar 2012 13:28:21 +0000
 
diff --git a/debian/patches/errno.patch b/debian/patches/errno.patch
new file mode 100644
index 0000000..ee158cd
--- /dev/null
+++ b/debian/patches/errno.patch
@@ -0,0 +1,44 @@
+Bug-Debian: http://bugs.debian.org/660562
+Description: Fix errrno conflict on Hurd-i386.
+Last-Updated: 2012-02-21
+Forwarded: no
+Author: Pino Toscano
+
+--- a/src/adios_error.c
++++ b/src/adios_error.c
+@@ -29,19 +29,19 @@
+     return aerr; 
+ }
+ 
+-void adios_error (enum ADIOS_ERRCODES errno, char *fmt, ...) 
++void adios_error (enum ADIOS_ERRCODES aerrno, char *fmt, ...) 
+ {
+     va_list ap;
+-    adios_errno = (int)errno;
++    adios_errno = (int)aerrno;
+     va_start(ap, fmt);
+     (void) vsnprintf(aerr, ERRMSG_MAXLEN, fmt, ap);
+     va_end(ap);
+ }
+ 
+-void adios_error_at_line (enum ADIOS_ERRCODES errno, const char* filename, unsigned int linenum, char *fmt, ...)
++void adios_error_at_line (enum ADIOS_ERRCODES aerrno, const char* filename, unsigned int linenum, char *fmt, ...)
+ {
+     va_list ap;
+-    adios_errno = (int)errno;
++    adios_errno = (int)aerrno;
+     va_start(ap, fmt);
+     (void) vsnprintf(aerr, ERRMSG_MAXLEN, fmt, ap);
+     va_end(ap);
+--- a/src/adios_error.h
++++ b/src/adios_error.h
+@@ -35,8 +35,8 @@
+     ,err_unspecified
+ };
+ 
+-void adios_error (enum ADIOS_ERRCODES errno, char *fmt, ...);
+-void adios_error_at_line (enum ADIOS_ERRCODES errno, const char* filename, unsigned int linenum, char *fmt, ...);
++void adios_error (enum ADIOS_ERRCODES aerrno, char *fmt, ...);
++void adios_error_at_line (enum ADIOS_ERRCODES aerrno, const char* filename, unsigned int linenum, char *fmt, ...);
+ 
+ const char* adios_get_last_errmsg (void);
diff --git a/debian/patches/series b/debian/patches/series
index 76fc805..fd5c27c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ sh4.patch
 mpi_in_place.patch
 nompi_flag.patch
 security.patch
+errno.patch

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