[Pkg-gridengine-commits] [pkg-gridengine] 03/03: Adjust upstream patch to fix a build regression

[Afif Elghraoui]

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

afif pushed a commit to branch master
in repository pkg-gridengine.

commit b17a4544c5e691735da87a5f54bc919172632891
Author: Afif Elghraoui <afif at debian.org>
Date:   Sat Aug 27 22:06:26 2016 -0700

    Adjust upstream patch to fix a build regression
    
    See https://arc.liv.ac.uk/trac/SGE/ticket/1581
---
 debian/patches/union-wait.patch | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/patches/union-wait.patch b/debian/patches/union-wait.patch
index 627e6da..6f545b7 100644
--- a/debian/patches/union-wait.patch
+++ b/debian/patches/union-wait.patch
@@ -25,20 +25,26 @@ Bug-Debian: http://bugs.debian.org/833995
  # ifndef BSDWAIT
 --- pkg-gridengine.orig/source/clients/qevent/qevent.c
 +++ pkg-gridengine/source/clients/qevent/qevent.c
-@@ -303,10 +303,6 @@
+@@ -299,26 +299,15 @@
+ 
+    if (pid > 0) {
+       int exit_status;
++      int status;
+ 
  #if !defined(INTERIX)
        struct rusage rusage;
- #endif
+-#endif
 -
 -#if defined(SVR3) || defined(_BSD)
 -      union wait status;
--#else
-       int status;
- #endif
- #if defined(INTERIX)
-@@ -314,11 +310,7 @@
++      wait3(&status, 0, &rusage);
  #else
-       wait3(&status, 0, &rusage);
+-      int status;
+-#endif
+-#if defined(INTERIX)
+       waitpid(pid, &status, 0);
+-#else
+-      wait3(&status, 0, &rusage);
  #endif
 -#if defined(SVR3) || defined(_BSD)
 -      exit_status = status.w_retcode;

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