[Pkg-gridengine-commits] [pkg-gridengine] 01/05: Simplify changes for alpha arch java path

[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 2911317871bfe6ce5c7c92d639ace160649240a4
Author: Afif Elghraoui <afif at debian.org>
Date:   Mon Aug 29 22:53:53 2016 -0700

    Simplify changes for alpha arch java path
    
    It can be handled the same way as other architectures,
    so it doesn't need its own case block.
---
 debian/patches/java-paths.patch | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/debian/patches/java-paths.patch b/debian/patches/java-paths.patch
index 60dc724..2ee52e9 100644
--- a/debian/patches/java-paths.patch
+++ b/debian/patches/java-paths.patch
@@ -8,26 +8,18 @@ Forwarded: no
 Last-Update: 2016-08-28
 --- pkg-gridengine.orig/source/aimk
 +++ pkg-gridengine/source/aimk
-@@ -1918,6 +1918,10 @@
-    if ("$JAVA_ARCH" != "") then
-       set CORE_INCLUDE = "$CORE_INCLUDE -I${JAVA_HOME}/${JAVA_INCL}/${JAVA_ARCH}"
-       switch ($buildarch)
-+	 case ulx-alpha:
-+	 case lx-alpha:
-+	     set JAVA_LIB_ARCH = alpha
-+	     breaksw
-          case lx-x86:
-          case ulx-x86:
-          case nbsd-i386:
-@@ -1957,7 +1961,6 @@
+@@ -1957,8 +1957,9 @@
           case lx-mips:
           case lx-mipsel:
           case lx-ppc:
 -         case lx-sparc: # debian squeeze; no openjdk in wheezy, but has gcj
           case lx-ppc64le:       # Fedora                                     
++	 case ulx-alpha:
++	 case lx-alpha:
               set JAVA_LIB_ARCH = `expr substr $buildarch 4 9`
               breaksw
-@@ -1972,9 +1975,15 @@
+          case lx-ppc64:
+@@ -1972,9 +1973,15 @@
               if ($FORCE_32BIT == 1) then
                  set JAVA_LIB_ARCH = arm
               else

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