From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Fri, 8 Jan 2021 21:38:56 +0100
Subject: Don't run extra options on ARM

Don't try to download and extract arduino-builder and avr toolchain if
the build is called from an ARM arcitecture.

Forwarded: not-needed
---
 build/build.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/build/build.xml b/build/build.xml
index fb7cc35..81072d9 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -719,6 +719,7 @@
 
     <antcall target="build-arduino-builder" />
 
+    <!-- (((
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar-native"/>
       <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-arm-linux-gnueabihf.tar.bz2"/>
@@ -728,9 +729,11 @@
       <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_arm.tar.bz2"/>
       <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
     </antcall>
+    ))) -->
   </target>
 
   <target name="linux-libastyle-aarch64" depends="linux-build" description="Download libastyle.so for AArch64">
+    <!-- (((
     <antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.1-5.zip" />
       <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.zip" />
@@ -739,11 +742,13 @@
     </antcall>
     <copy file="linux/libastylej-2.05.1/libastylej_aarch64.so" tofile="linux/work/lib/libastylej.so" />
     <chmod perm="755" file="linux/work/lib/libastylej.so" />
+    ))) -->
 
     <antcall target="portable-${portable}">
       <param name="parentdir" value="linux/work" />
     </antcall>
 
+    <!-- (((
     <antcall target="unzip">
       <param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
       <param name="archive_url" value="https://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
@@ -752,6 +757,7 @@
     </antcall>
     <copy file="linux/liblistSerials-${LIBLISTSERIAL-VERSION}/aarch64/liblistSerialsj.so" todir="linux/work/lib/" />
     <chmod perm="755" file="linux/work/lib/liblistSerialsj.so" />
+    ))) -->
   </target>
 
   <target name="linuxaarch64-build" depends="linux-libastyle-aarch64" description="Build Linux (AArch64) version">
@@ -761,6 +767,7 @@
 
     <antcall target="build-arduino-builder" />
 
+    <!-- (((
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar-native"/>
       <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/>
@@ -770,6 +777,7 @@
       <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_aarch64.tar.bz2"/>
       <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
     </antcall>
+    ))) -->
   </target>
 
   <target name="linux32-build" depends="linux-libastyle-x86" description="Build linux (32-bit) version">
@@ -816,6 +824,7 @@
 
   <target name="build-arduino-builder" unless="no_arduino_builder">
     <property name="ARDUINO-BUILDER-EXTRA-VERSION" value="" /> <!-- default if not set already -->
+    <!-- (((
     <delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
     <mkdir dir="${staging_folder}/arduino-builder-${platform}"/>
     <antcall target="untar-native">
@@ -831,6 +840,7 @@
       <fileset dir="${staging_folder}/arduino-builder-${platform}/hardware" includes="*.txt"/>
     </copy>
     <delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
+    ))) -->
   </target>
 
   <!-- Set '${dist_file}_available' property if toolchain dist_file is downloaded              -->