[Pkg-gridengine-commits] [pkg-gridengine] 11/16: Drop ppc64el patch - similar change was made upstream

[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 83cdbacc0a63063455e9aa4625e8668f0dc79d5d
Author: Afif Elghraoui <afif at debian.org>
Date:   Sat Jul 9 17:02:32 2016 -0700

    Drop ppc64el patch - similar change was made upstream
---
 debian/patches/ppc64el-support.patch | 36 ------------------------------------
 debian/patches/series                |  1 -
 2 files changed, 37 deletions(-)

diff --git a/debian/patches/ppc64el-support.patch b/debian/patches/ppc64el-support.patch
deleted file mode 100644
index 59a99fe..0000000
--- a/debian/patches/ppc64el-support.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix ppc64el support on Debian
- On ppc64 LE, the code supposes that the return of "uname -m" is only powerpc64le.
- I've never seen a value like this on Debian/Ubuntu/Opensuse/Fedora. I'm keeping it
- though, but I'm also adding ppc64le (returned on all those 4 distros) in source/dist/util/arch.
- For JAVA_LIB_ARCH in aimk, I've never found ppc64el in the "lib/<arch>/server/libjvm.so"
- path, so I think it's an error and changed it to ppc64le (checked on the previous distros)
- .
- A similar patch was applied upstream. See the link below.
-Author: frediz at linux.vnet.ibm.com
-Origin: https://bugs.debian.org/815754
-Bug: https://bugs.debian.org/815754
-Applied-Upstream: https://gitlab.com/loveshack/sge/commit/33cdba8f5203984495840e13ac032a21d2702594
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- pkg-gridengine.orig/source/dist/util/arch
-+++ pkg-gridengine/source/dist/util/arch
-@@ -214,7 +214,7 @@
-    powerpc64)
-       lxmachine=ppc64
-       ;;
--   powerpc64le)
-+   powerpc64le | ppc64le)
-       lxmachine=ppc64el
-       ;;
-    *)
---- pkg-gridengine.orig/source/aimk
-+++ pkg-gridengine/source/aimk
-@@ -2006,7 +2006,7 @@
-              if ($FORCE_32BIT == 1) then
-                 # fixme: raise error (not ppcle)?
-              else
--                set JAVA_LIB_ARCH = ppc64el
-+                set JAVA_LIB_ARCH = ppc64le
-              endif
-              breaksw
-          case lx-arm64:
diff --git a/debian/patches/series b/debian/patches/series
index 36d059f..a4675fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 compiler-flags.patch
-ppc64el-support.patch

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