1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
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
@@ -296,9 +296,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
@@ -52,6 +52,7 @@
- isLinuxPpc
- isLinuxPpc64
- isLinuxPpc64le
+ - isLinuxAarch64
- isLinuxRiscV64
- isLinuxs390
- isLinuxs390x
@@ -149,6 +150,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
@@ -464,6 +466,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}" />
@@ -878,6 +889,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}" />
|
