[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - odk/settings

[Rene Engelhard]

 odk/settings/settings.mk |   24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

New commits:
commit 5f3714932492374115a2195d9ac100a154dd5b1d
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Jun 9 21:08:31 2017 +0200

    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
    Reviewed-on: https://gerrit.libreoffice.org/38614
    Reviewed-by: Rene Engelhard <rene at debian.org>
    Tested-by: Rene Engelhard <rene at debian.org>

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