odk settings.mk: add various missing JAVA_PROC_TYPE overrides for Linux arches
authorRene Engelhard <rene@debian.org>
Fri, 9 Jun 2017 19:08:31 +0000 (21:08 +0200)
committerRaspbian forward porter <root@raspbian.org>
Thu, 27 Jul 2017 23:16:27 +0000 (00:16 +0100)
... 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

odk/settings/settings.mk

index 74bd791c0462256683cd142783d588f9fc25d1ff..b5fd5fe5942660060e3b6d8f0655bff6faea2471 100644 (file)
@@ -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