Add missing deps for building the drmaa docs along with other minor fixes (#345463). Thanks to Kacper Kowalik <xarthisius@gentoo.org> who did most of the work.

(Portage version: 2.1.9.24/cvs/Linux x86_64)

3 files changed, 139 insertions, 0 deletions

diff --git a/sys-cluster/torque/files/0001-fix-parallel-doc-install.patch b/sys-cluster/torque/files/0001-fix-parallel-doc-install.patch
new file mode 100644
index 000000000000..8505787062ab
--- /dev/null
+++ b/sys-cluster/torque/files/0001-fix-parallel-doc-install.patch
@@ -0,0 +1,35 @@
+From d29ba6daadde49d4e2325b415f2fe614bd2cbad1 Mon Sep 17 00:00:00 2001
+From: Kacper Kowalik <xarthisius@gentoo.org>
+Date: Tue, 16 Nov 2010 16:23:14 -0500
+Subject: [PATCH 1/4] fix parallel doc install
+
+man7/pbs_resources_irix5.7 was defined twice.
+
+Thanks to Kacper Kowalik <xarthisius@gentoo.org>
+---
+ doc/Makefile.am |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 797b4d6..d4b474c 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -33,7 +33,6 @@ EXTRA_DIST = man1/qalter.1.in man1/qdel.1.in man1/qhold.1.in man1/qmove.1.in \
+ 	     man7/pbs_resources_fujitsu.7.in \
+ 	     man7/pbs_resources_hpux10.7.in man7/pbs_resources_irix5.7.in \
+ 	     man7/pbs_resources_hpux11.7.in \
+-	     man7/pbs_resources_irix5.7.in \
+ 	     man7/pbs_resources_irix6.7.in man7/pbs_resources_irix6array.7.in \
+ 	     man7/pbs_resources_linux.7.in man7/pbs_resources_netbsd.7.in \
+ 	     man7/pbs_resources_solaris5.7.in man7/pbs_resources_solaris7.7.in \
+@@ -79,7 +78,6 @@ nodist_man7_MANS = man7/pbs_job_attributes.7 man7/pbs_queue_attributes.7 \
+ 		   man7/pbs_resources_freebsd.7 man7/pbs_resources_fujitsu.7 \
+ 		   man7/pbs_resources_hpux10.7 man7/pbs_resources_irix5.7 \
+ 		   man7/pbs_resources_hpux11.7 \
+-		   man7/pbs_resources_irix5.7 \
+ 		   man7/pbs_resources_irix6.7 man7/pbs_resources_irix6array.7 \
+ 		   man7/pbs_resources_linux.7 man7/pbs_resources_netbsd.7 \
+ 		   man7/pbs_resources_solaris5.7 man7/pbs_resources_solaris7.7 \
+-- 
+1.7.2.2
+
diff --git a/sys-cluster/torque/files/0002-fix-implicit-declaration-warnings.patch b/sys-cluster/torque/files/0002-fix-implicit-declaration-warnings.patch
new file mode 100644
index 000000000000..49bf1f9a8602
--- /dev/null
+++ b/sys-cluster/torque/files/0002-fix-implicit-declaration-warnings.patch
@@ -0,0 +1,53 @@
+From 7a60464264bafb27c4bbaab39744b267d671f41b Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Tue, 16 Nov 2010 16:31:25 -0500
+Subject: [PATCH 2/3] fix implicit declaration warnings
+
+vasprintf and asprintf require _GNU_SOURCE.
+
+Thanks to Kacper Kowalik <xarthisius@gentoo.org>
+---
+ src/drmaa/src/error.c  |    1 +
+ src/drmaa/src/submit.c |    1 +
+ src/drmaa/src/wait.c   |    1 +
+ 3 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/drmaa/src/error.c b/src/drmaa/src/error.c
+index b848041..4a65b47 100644
+--- a/src/drmaa/src/error.c
++++ b/src/drmaa/src/error.c
+@@ -23,6 +23,7 @@
+ # include <pbs_config.h>
+ #endif
+ 
++#define _GNU_SOURCE // asprintf
+ #include <unistd.h>
+ 
+ #include <stdio.h>
+diff --git a/src/drmaa/src/submit.c b/src/drmaa/src/submit.c
+index e9b404c..9f06620 100644
+--- a/src/drmaa/src/submit.c
++++ b/src/drmaa/src/submit.c
+@@ -23,6 +23,7 @@
+ # include <pbs_config.h>
+ #endif
+ 
++#define _GNU_SOURCE
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <limits.h>
+diff --git a/src/drmaa/src/wait.c b/src/drmaa/src/wait.c
+index ecb2ed4..2ef7600 100644
+--- a/src/drmaa/src/wait.c
++++ b/src/drmaa/src/wait.c
+@@ -23,6 +23,7 @@
+ # include <pbs_config.h>
+ #endif
+ 
++#define _GNU_SOURCE // vasprintf
+ #include <assert.h>
+ #include <limits.h>
+ #include <signal.h>
+-- 
+1.7.2.2
+
diff --git a/sys-cluster/torque/files/0003-disable-automagic-doc-building.patch b/sys-cluster/torque/files/0003-disable-automagic-doc-building.patch
new file mode 100644
index 000000000000..43632c3f2115
--- /dev/null
+++ b/sys-cluster/torque/files/0003-disable-automagic-doc-building.patch
@@ -0,0 +1,51 @@
+From 7351d31442fcf324b7f7769911af8a98368506e2 Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Tue, 16 Nov 2010 17:03:13 -0500
+Subject: [PATCH 3/3] disable automagic doc building
+
+Instead of unconditionally building docs if doxygen is found, only build
+at the request of the user.
+---
+ configure.ac |   19 +++++++++++++------
+ 1 files changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 480e23e..a8182cd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1237,8 +1237,6 @@ dnl
+ if test "$build_drmaa" = "yes" ;then
+ AC_MSG_NOTICE([Configuring DRMAA ...])
+ AC_PATH_PROG(GPERF, "gperf")
+-AX_PROG_DOT
+-AC_PATH_PROG(DOXYGEN, "doxygen", "none")
+ AC_C_BIGENDIAN_CROSS
+ ACX_PTHREAD(,[AC_MSG_ERROR([POSIX threads library is required by DRMAA.])])
+ 
+@@ -1282,10 +1280,19 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]],
+   AC_MSG_RESULT([no])
+ ])
+ 
+- build_drmaa_docs=yes
+-else  
+-  DOXYGEN=none
+- build_drmaa_docs=no
++AC_ARG_ENABLE([apidocs],
++    AS_HELP_STRING([--enable-apidocs],[Build DRMAA documentation])
++)
++AS_IF([test "x$enable_apidocs" = "xyes"],
++    [ AX_PROG_DOT
++      AC_PATH_PROG(DOXYGEN, "doxygen", "none")
++      build_drmaa_docs=yes ],
++    [ build_drmaa_docs=no
++      DOXYGEN=none ]
++)
++else
++    DOXYGEN="none"
++    build_drmaa_docs=no
+ fi
+ AM_CONDITIONAL(DRMAA_DOCS, [test "$DOXYGEN" != "none"])
+ AC_SUBST(build_drmaa_docs)
+-- 
+1.7.2.2
+