[Pkg-gridengine-commits] [pkg-gridengine] 04/05: Updated attempt to port to kFreeBSD

[Afif Elghraoui]

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

afif pushed a commit to branch debian/experimental
in repository pkg-gridengine.

commit 396845007b05559654380423f4b3b5f1d4624f09
Author: Afif Elghraoui <afif at debian.org>
Date:   Mon Aug 29 23:35:54 2016 -0700

    Updated attempt to port to kFreeBSD
---
 debian/linux32-wrapper        |  2 +-
 debian/patches/kFreeBSD.patch | 27 ++++++++++++++++++++++++++-
 debian/patches/series         |  2 +-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/debian/linux32-wrapper b/debian/linux32-wrapper
index ac4a986..683608b 100755
--- a/debian/linux32-wrapper
+++ b/debian/linux32-wrapper
@@ -11,7 +11,7 @@
 DEB_BUILD_ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)
 
 case ${DEB_BUILD_ARCH} in
-powerpc|i386|sparc|s390|hppa|armel|armhf|mips|mipsel)
+powerpc|i386|kfreebsd-i386|sparc|s390|hppa|armel|armhf|mips|mipsel)
     exec /usr/bin/linux32 "$@";;
 *)
     exec "$@";;
diff --git a/debian/patches/kFreeBSD.patch b/debian/patches/kFreeBSD.patch
index 529b64e..23d0aef 100644
--- a/debian/patches/kFreeBSD.patch
+++ b/debian/patches/kFreeBSD.patch
@@ -2,7 +2,8 @@ Description: Build kFreeBSD as though it were regular FreeBSD
  kFreeBSD's uname is unrecognized by gridengine's build system.
 Author: Afif Elghraoui <afif at debian.org>
 Forwarded: no
-Last-Update: 2016-07-09
+Bug-Debian: https://bugs.debian.org/828875
+Last-Update: 2016-08-29
 --- pkg-gridengine.orig/source/dist/util/arch
 +++ pkg-gridengine/source/dist/util/arch
 @@ -130,7 +130,7 @@
@@ -14,3 +15,27 @@ Last-Update: 2016-07-09
     ARCH=fbsd-$osmachine
     ;;
  NetBSD)
+--- pkg-gridengine.orig/source/aimk
++++ pkg-gridengine/source/aimk
+@@ -1990,7 +1990,10 @@
+              set JAVA_LIB_ARCH = PA_RISC2.0W
+              breaksw
+          case fbsd-i386:
+-             set JAVA_LIB_ARCH = linux
++             set JAVA_LIB_ARCH = i386
++             breaksw
++         case fbsd-amd64:
++             set JAVA_LIB_ARCH = amd64
+              breaksw
+          case irix65:
+          case darwin-*:
+--- pkg-gridengine.orig/source/libs/uti2/util.h
++++ pkg-gridengine/source/libs/uti2/util.h
+@@ -7,6 +7,7 @@
+ bool file_exists(const char *file);
+ /* fixme: extend, in the absence of autoconf */
+ #define HAVE_STRSIGNAL (__linux__ || __sun || __sun__ || __NetBSD__ || \
++                        __FreeBSD_kernel__ || \
+                         __FreeBSD__ || __OpenBSD__ || __DragonFly__)
+ #if !HAVE_STRSIGNAL
+ char *strsignal(int sig);
diff --git a/debian/patches/series b/debian/patches/series
index 81c9b84..b7c2e95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
-kFreeBSD.patch
 compiler-flags.patch
 union-wait.patch
 m32_m64.patch
 java-paths.patch
 x32.patch
+kFreeBSD.patch

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