From: Rene Engelhard <rene@debian.org>
Date: Fri, 9 Jun 2017 19:08:31 +0000 (+0200)
Subject: odk settings.mk: add various missing JAVA_PROC_TYPE overrides for Linux arches
X-Git-Tag: archive/raspbian/1%5.4.0-1+rpi1~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fe26047e867ee7195b898cdceeccfbd94f792d0e;p=libreoffice.git

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

Gbp-Pq: Name odk-settings-JAVA_PROC_TYPE.diff
---

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 74bd791c046..b5fd5fe5942 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -277,6 +277,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