[Pkg-gridengine-commits] [pkg-gridengine] 02/03: Don't force -m32/-m64 for native compilation

[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 583bab92073e0fbc1f9d6495d95eb74c81e61695
Author: Afif Elghraoui <afif at debian.org>
Date:   Sat Aug 27 20:24:03 2016 -0700

    Don't force -m32/-m64 for native compilation
    
    This should fix the build on mips64.
    
    Closes: #828877
---
 debian/patches/m32_m64.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 2 files changed, 28 insertions(+)

diff --git a/debian/patches/m32_m64.patch b/debian/patches/m32_m64.patch
new file mode 100644
index 0000000..b10d936
--- /dev/null
+++ b/debian/patches/m32_m64.patch
@@ -0,0 +1,27 @@
+Description: Do not pass -m32/-m64 flags for native compilation
+ 
+Author: Afif Elghraoui <afif at debian.org>
+Bug-Debian: https://bugs.debian.org/828877
+Forwarded: no
+Last-Update: 2016-08-27
+--- pkg-gridengine.orig/source/aimk
++++ pkg-gridengine/source/aimk
+@@ -1411,17 +1411,7 @@
+ #       set CC  = clanga
+ #       set CFLAGS = "$CFLAGS -Wno-unused-value"
+ 
+-   if ($BUILDARCH == LINUXPPC) then
+-      set CFLAGS = "-m32 $CFLAGS" # fixme: why?
+-      set LFLAGS = "-m32 $LFLAGS"
+-      set SHARED_LFLAGS = "-m32 $SHARED_LFLAGS"
+-   else if ($BUILDARCH == LINUXSPARC64 || $BUILDARCH == LINUXPPC64 || $BUILDARCH == LINUXMIPS64) then
+-      if ($FORCE_32BIT != 1) then
+-         set CFLAGS = "-m64 $CFLAGS"
+-         set LFLAGS = "-m64 $LFLAGS"
+-         set SHARED_LFLAGS = "-m64 $SHARED_LFLAGS"
+-      endif
+-   else if ($BUILDARCH == LINUXS390X && $FORCE_32BIT == 1) then
++   if ($BUILDARCH == LINUXS390X && $FORCE_32BIT == 1) then
+       set CFLAGS = "-m31 $CFLAGS"
+       set LFLAGS = "-m31 $LFLAGS"
+       set SHARED_LFLAGS = "-m31 $SHARED_LFLAGS"
diff --git a/debian/patches/series b/debian/patches/series
index 0eee50e..e688a6e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 compiler-flags.patch
 union-wait.patch
+m32_m64.patch

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