[Pkg-gridengine-commits] [pkg-gridengine] 02/05: Attempt support for x32

[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 1f9c8779a1ef0c1ff582ed84ae6c7921c74238be
Author: Afif Elghraoui <afif at debian.org>
Date:   Mon Aug 29 22:54:50 2016 -0700

    Attempt support for x32
    
    This targets #828884. If successful, this patch will close it.
---
 debian/patches/series    |  1 +
 debian/patches/x32.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 1ae6c5f..3d5f2ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ compiler-flags.patch
 union-wait.patch
 m32_m64.patch
 java-paths.patch
+x32.patch
diff --git a/debian/patches/x32.patch b/debian/patches/x32.patch
new file mode 100644
index 0000000..750aaf5
--- /dev/null
+++ b/debian/patches/x32.patch
@@ -0,0 +1,43 @@
+Description: Add support for x32
+ Used information from https://wiki.debian.org/X32Port
+Author: Afif Elghraoui <afif at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=828884
+Forwarded: no
+Last-Update: 2016-08-29
+--- pkg-gridengine.orig/source/dist/util/arch
++++ pkg-gridengine/source/dist/util/arch
+@@ -200,7 +200,11 @@
+       lxmachine=sparc
+       ;;
+    x86_64)
+-      lxmachine=amd64
++      if /usr/bin/cpp -dM </dev/null | grep -q __ILP32__; then
++	  lxmachine=x32
++      else
++	  lxmachine=amd64
++      fi
+       ;;
+    mips)
+       lxmachine=mips
+--- pkg-gridengine.orig/source/aimk
++++ pkg-gridengine/source/aimk
+@@ -1960,6 +1960,7 @@
+          case lx-ppc64le:       # Fedora                                     
+ 	 case ulx-alpha:
+ 	 case lx-alpha:
++	 case lx-x32:
+              set JAVA_LIB_ARCH = `expr substr $buildarch 4 9`
+              breaksw
+          case lx-ppc64:
+--- pkg-gridengine.orig/source/scripts/compilearch
++++ pkg-gridengine/source/scripts/compilearch
+@@ -173,6 +173,9 @@
+       COMPILE_ARCH=LINUXAMD64
+       TARGET_BITS=TARGET_64BIT
+       ;;
++   lx-x32)
++      BUILDARCH=LINUXX32
++      COMPILE_ARCH=LINUXX32
+    lx-ia64)
+       BUILDARCH=LINUXIA64
+       COMPILE_ARCH=LINUXIA64

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