[commons-daemon] 47/52: Imported Debian patch 1.0.15-5

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository commons-daemon.

commit 91d9bf7de92c503bde8620c9b99361f628303926
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 27 00:21:08 2014 +0100

    Imported Debian patch 1.0.15-5
---
 debian/changelog                 |  6 ++++++
 debian/patches/hurd_support.diff | 14 ++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 05e4539..a852979 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+commons-daemon (1.0.15-5) unstable; urgency=medium
+
+  * Another attempt to support Hurd
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 27 Jan 2014 00:21:08 +0100
+
 commons-daemon (1.0.15-4) unstable; urgency=medium
 
   * Added a patch defining the PATH_MAX constant to compile on Hurd
diff --git a/debian/patches/hurd_support.diff b/debian/patches/hurd_support.diff
index e8bea16..2fd167f 100644
--- a/debian/patches/hurd_support.diff
+++ b/debian/patches/hurd_support.diff
@@ -14,3 +14,17 @@ Forwarded: https://issues.apache.org/jira/browse/DAEMON-294
  /* Return the argument of a command line option */
  static char *optional(int argc, char *argv[], int argi)
  {
+--- a/src/native/unix/support/apsupport.m4
++++ b/src/native/unix/support/apsupport.m4
+@@ -78,6 +78,11 @@
+     supported_os="kfreebsd-gnu"
+     LIBS="$LIBS -ldl -lpthread"
+     ;;
++  gnu*)
++    CFLAGS="$CFLAGS -DOS_HURD -DDSO_DLFCN -pthread "
++    supported_os="hurd-gnu"
++    LIBS="$LIBS -ldl -lpthread"
++    ;;
+   *)
+     AC_MSG_RESULT([failed])
+     AC_MSG_ERROR([Unsupported operating system "$host_os"])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-daemon.git