[eso-midas] 03/03: Fix another FTBS on kfreebsd

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository eso-midas.

commit 11ca508f9063383135f367712d148a5bb3a31fea
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jun 5 14:07:19 2014 +0200

    Fix another FTBS on kfreebsd
---
 debian/changelog                        |  1 +
 debian/patches/fix_POSIX_VDISABLE.patch | 35 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index da9f64e..7711f0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 eso-midas (13.09pl1.2+dfsg-3) UNRELEASED; urgency=low
 
   * include libgmidas shared library
+  * Fix (another) FTBS on kfreebsd
 
  -- Ole Streicher <debian at liska.ath.cx>  Thu, 05 Jun 2014 14:04:51 +0200
 
diff --git a/debian/patches/fix_POSIX_VDISABLE.patch b/debian/patches/fix_POSIX_VDISABLE.patch
new file mode 100644
index 0000000..a22e6cd
--- /dev/null
+++ b/debian/patches/fix_POSIX_VDISABLE.patch
@@ -0,0 +1,35 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Dont compare _POSIX_VDISABLE in preprocessor.
+ _POSIX_VDISABLE is not guaranteed to be resolvable by cpp, and
+ in kfreeBSD this causes an FTBS.
+--- a/libsrc/os/unix/ost.c
++++ b/libsrc/os/unix/ost.c
+@@ -178,14 +178,16 @@
+ # define _POSIX_VDISABLE -1
+ #endif
+ 
+-#if defined(_POSIX_VDISABLE) && (_POSIX_VDISABLE != -1)
++#if defined(_POSIX_VDISABLE)
++  if (_POSIX_VDISABLE != -1) {
+ 
+   /* The symbol is defined so we can just use it */
+   tty1.c_cc[VQUIT] = _POSIX_VDISABLE;
+   tty1.c_cc[VSUSP] = _POSIX_VDISABLE;
+ 
+-#else /* The symbol is not defined */
+-
++  } else
++#endif
++  {
+   long temp;
+ 
+   errno = 0;	/* Make sure we can tell if fpathconf() changes errno. */
+@@ -209,7 +211,7 @@
+   tty1.c_cc[VQUIT] = 0377;
+   tty1.c_cc[VSUSP] = 0377;
+ 
+-#endif
++  }
+ 
+ return(0);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index c4725dd..e0828e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ dotlockfile.patch
 dfsg-free-msg_h.patch
 fix_manpages.patch
 fix_missing_haddr.patch
+fix_POSIX_VDISABLE.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/eso-midas.git