[libreoffice] 01/01: set correct JAVA_PROC_TYPE for arm{el, hf}, mips* and ppc64el

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit d404efe817e90235e76ea2d4c6983b8881735f55
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Jun 9 21:27:34 2017 +0200

    set correct JAVA_PROC_TYPE for arm{el,hf}, mips* and ppc64el
---
 changelog                                |  3 ++
 patches/odk-settings-JAVA_PROC_TYPE.diff | 52 ++++++++++++++++++++++++++++++++
 patches/series                           |  1 +
 3 files changed, 56 insertions(+)

diff --git a/changelog b/changelog
index d513881..55decc5 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,9 @@ libreoffice (1:5.3.4~rc1-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate
 
+  * debian/patches/odk-settings-JAVA_PROC_TYPE.diff: set correct
+    JAVA_PROC_TYPE for arm{el,hf}, mips* and ppc64el
+
  -- Rene Engelhard <rene at debian.org>  Thu, 01 Jun 2017 20:46:05 +0200
 
 libreoffice (1:5.3.3-2) experimental; urgency=medium
diff --git a/patches/odk-settings-JAVA_PROC_TYPE.diff b/patches/odk-settings-JAVA_PROC_TYPE.diff
new file mode 100644
index 0000000..9a2eb00
--- /dev/null
+++ b/patches/odk-settings-JAVA_PROC_TYPE.diff
@@ -0,0 +1,52 @@
+From 4256ac0daa42107cfaf1ce54dbd1db6ce82975b0 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene at debian.org>
+Date: Fri, 9 Jun 2017 21:08:31 +0200
+Subject: [PATCH] odk settings.mk: add various missing JAVA_PROC_TYPE overrides
+ for Linux arches
+
+... which were missing since ~ ever but now break the odk_build-examples test
+with /usr/bin/ld: cannot find -ljawt
+
+Change-Id: Ie504ce0c8e21c7d58f1b7e591505940a2f80a2ea
+---
+ odk/settings/settings.mk | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
+index b455a6b5d399..2813959f5dec 100644
+--- a/odk/settings/settings.mk
++++ b/odk/settings/settings.mk
+@@ -275,6 +275,30 @@ ifeq "$(PROCTYPE)" "powerpc64"
+ JAVA_PROC_TYPE=ppc64
+ endif
+ 
++ifeq "$(PROCTYPE)" "powerpc64_le"
++JAVA_PROC_TYPE=ppc64le
++endif
++
++ifeq "$(PROCTYPE)" "arm_eabi"
++JAVA_PROC_TYPE=arm
++endif
++
++ifeq "$(PROCTYPE)" "arm_oabi"
++JAVA_PROC_TYPE=arm
++endif
++
++ifeq "$(PROCTYPE)" "mips_eb"
++JAVA_PROC_TYPE=mips
++endif
++
++ifeq "$(PROCTYPE)" "mips_el"
++JAVA_PROC_TYPE=mipsel
++endif
++
++ifeq "$(PROCTYPE)" "mips64_el"
++JAVA_PROC_TYPE=mips64el
++endif
++
+ ifeq "$(PROCTYPE)" "sparc64"
+ UNOPKG_PLATFORM=Linux_SPARC64
+ JAVA_PROC_TYPE=sparcv9
+-- 
+2.11.0
+
diff --git a/patches/series b/patches/series
index d9811fc..8efafe3 100644
--- a/patches/series
+++ b/patches/series
@@ -32,3 +32,4 @@ m68k-alignment.diff
 change-from-glew-to-epoxy.diff
 gtk3-opengl-slideshow.diff
 m68k-use-mlong-jump-table-offsets.diff
+odk-settings-JAVA_PROC_TYPE.diff

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