[Pkg-gridengine-commits] [pkg-gridengine] 03/04: Set proper Java paths for arm64, mips64el, sparc64, and alpha

[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 92efedde29a9731572d0170337b2f71c3a182a80
Author: Afif Elghraoui <afif at debian.org>
Date:   Mon Aug 29 00:19:28 2016 -0700

    Set proper Java paths for arm64, mips64el, sparc64, and alpha
    
    See the patch header. The correct Java paths were identified from
    the jre package lists (for example
    https://packages.debian.org/sid/alpha/openjdk-8-jre-headless/filelist )
---
 debian/patches/java-paths.patch | 46 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 2 files changed, 47 insertions(+)

diff --git a/debian/patches/java-paths.patch b/debian/patches/java-paths.patch
new file mode 100644
index 0000000..60dc724
--- /dev/null
+++ b/debian/patches/java-paths.patch
@@ -0,0 +1,46 @@
+Description: Fix JAVA_LIB_ARCH paths for certain architectures
+ Some architectures have unconventional (or just undefined, in the case of
+ alpha) paths to Java libraries. See Debian #828873. This patch works
+ arounds those inconsistencies to fix the package building on mips64el,
+ sparc64, and arm64. The build for alpha should also be working now.
+Author: Afif Elghraoui <afif at debian.org>
+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 @@
+          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                                     
+              set JAVA_LIB_ARCH = `expr substr $buildarch 4 9`
+              breaksw
+@@ -1972,9 +1975,15 @@
+              if ($FORCE_32BIT == 1) then
+                 set JAVA_LIB_ARCH = arm
+              else
+-                set JAVA_LIB_ARCH = arm64
++                set JAVA_LIB_ARCH = aarch64
+              endif
+              breaksw
++	 case lx-mips64:
++	      set JAVA_LIB_ARCH = mips64el
++	      breaksw
++	 case lx-sparc:
++	      set JAVA_LIB_ARCH = sparcv9
++	      breaksw
+          case hp11:
+              set JAVA_LIB_ARCH = PA_RISC
+              breaksw
diff --git a/debian/patches/series b/debian/patches/series
index e688a6e..1ae6c5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 compiler-flags.patch
 union-wait.patch
 m32_m64.patch
+java-paths.patch

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