[Pkg-gridengine-commits] [pkg-gridengine] 01/02: Additional changes to support 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 169a216f1b3f7cd4b4e54df8155f5303665d2f75
Author: Afif Elghraoui <afif at debian.org>
Date:   Tue Aug 30 23:22:20 2016 -0700

    Additional changes to support kFreeBSD
    
    * Don't use linux32-wrapper for kfreebsd-i386
    * Set arch for kfreebsd-amd64 to fbsd-amd64 (it was getting set to
      fbsd-x86_64, which isn't recognized by the rest of the build system)
---
 debian/linux32-wrapper        |  2 +-
 debian/patches/kFreeBSD.patch | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/linux32-wrapper b/debian/linux32-wrapper
index 683608b..ac4a986 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|kfreebsd-i386|sparc|s390|hppa|armel|armhf|mips|mipsel)
+powerpc|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 23d0aef..a3381af 100644
--- a/debian/patches/kFreeBSD.patch
+++ b/debian/patches/kFreeBSD.patch
@@ -6,15 +6,25 @@ 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 @@
+@@ -130,8 +130,16 @@
        ARCH=darwin-$darwin_machine
     fi
     ;;
 -FreeBSD|DragonFly)
+-   ARCH=fbsd-$osmachine
 +GNU/kFreeBSD|FreeBSD|DragonFly)
-    ARCH=fbsd-$osmachine
++   case $osmachine in
++	x86_64)
++	    fbsdmachine=amd64
++	    ;;
++	*)
++	    fbsdmachine=$osmachine
++	    ;;
++   esac
++   ARCH=fbsd-$fbsdmachine
     ;;
  NetBSD)
+     osprocessor="`$UNAME -p`"
 --- pkg-gridengine.orig/source/aimk
 +++ pkg-gridengine/source/aimk
 @@ -1990,7 +1990,10 @@

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