Description: having the software build on Debian arm64
Author: Tony Mancill <tmancill@debian.org>
Forwarded: not-needed
Last-Update: 2023-03-15

--- a/make/build.xml
+++ b/make/build.xml
@@ -288,9 +288,9 @@
       <property name="linker.cfg.id"                        value="linker.cfg.linux.armv6.armhf" />
     </target>
 
-    <target name="declare.linux.aarch64" if="isLinuxARM64">
+    <target name="declare.linux.aarch64" if="isLinuxAarch64">
       <echo message="Linux.aarch64" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.aarch64" />
+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
       <property name="linker.cfg.id"                        value="linker.cfg.linux.aarch64" />
     </target>
 
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -51,6 +51,7 @@
    -   isLinuxPpc
    -   isLinuxPpc64
    -   isLinuxPpc64le
+   -   isLinuxAarch64
    -   isLinuxRiscV64
    -   isLinuxs390
    -   isLinuxs390x
@@ -148,6 +149,7 @@
    -   compiler.cfg.linux.ppc
    -   compiler.cfg.linux.ppc64
    -   compiler.cfg.linux.ppc64le
+   -   compiler.cfg.linux.aarch64
    -   compiler.cfg.linux.riscv64
    -   compiler.cfg.linux.s390
    -   compiler.cfg.linux.s390x
@@ -457,6 +459,15 @@
     <condition property="ppc64le">
       <os arch="ppc64le" />
     </condition>
+    <condition property="isLinuxAarch64">
+      <and>
+        <istrue value="${isLinux}" />
+        <os arch="aarch64" />
+      </and>
+    </condition>
+    <condition property="aarch64">
+      <os arch="aarch64" />
+    </condition>
     <condition property="isLinuxRiscV64">
       <and>
         <istrue value="${isLinux}" />
@@ -866,6 +877,7 @@
     <echo message="LinuxPpc=${isLinuxPpc}" />
     <echo message="LinuxPpc64=${isLinuxPpc64}" />
     <echo message="LinuxPpc64le=${isLinuxPpc64le}" />
+    <echo message="LinuxAarch64=${isLinuxAarch64}" />
     <echo message="LinuxRiscV64=${isLinuxRiscV64}" />
     <echo message="Linuxs390=${isLinuxs390}" />
     <echo message="Linuxs390x=${isLinuxs390x}" />