jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
void-packages/srcpkgs/arduino/patches/disable-dependency-build.patch
Evan Deaubl f221d9dfd0 arduino: update to 1.8.0 (#5436)
2017-01-08 09:36:07 +01:00

150 lines
8 KiB
Diff
Raw Blame History

--- build/build.xml.orig 2016-12-29 08:09:30.185309472 -0700
+++ build/build.xml 2016-12-29 08:11:41.992661097 -0700
@@ -449,17 +449,6 @@
</antcall>
<antcall target="unzip">
- <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
- <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
- <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
- <param name="dest_folder" value="${staging_folder}" />
- </antcall>
- <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
- <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.jnilib" />
- <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" tofile="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
- <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
-
- <antcall target="unzip">
<param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
<param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
<param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
@@ -491,16 +480,6 @@
<!-- Unzip AVR tools -->
<target name="macosx-build-avr-toolchain" unless="light_bundle">
- <antcall target="avr-toolchain-bundle">
- <param name="unpack_target" value="untar"/>
- <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i386-apple-darwin11.tar.bz2"/>
- <param name="gcc_version" value="${AVRGCC-VERSION}"/>
- <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/>
- <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
- <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-osx.tar.bz2"/>
- <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
- </antcall>
-
<chmod perm="+x">
<fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/*"/>
<fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/libexec/gcc/avr/4.8.1/*"/>
@@ -648,15 +627,6 @@
</target>
<target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
- <antcall target="unzip">
- <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
- <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
- <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
- <param name="dest_folder" value="${staging_folder}" />
- </antcall>
- <copy file="linux/libastylej-2.05.1/libastylej${arch-bits}.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>
@@ -673,15 +643,6 @@
</target>
<target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
- <antcall target="unzip">
- <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
- <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
- <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
- <param name="dest_folder" value="${staging_folder}" />
- </antcall>
- <copy file="linux/libastylej-2.05.1/libastylej_arm.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>
@@ -718,15 +679,6 @@
</copy>
<delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
- <antcall target="avr-toolchain-bundle">
- <param name="unpack_target" value="untar"/>
- <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
- <param name="gcc_version" value="${AVRGCC-VERSION}"/>
- <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
- <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
- <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linuxarm.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">
@@ -750,15 +702,6 @@
</copy>
<delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
- <antcall target="avr-toolchain-bundle">
- <param name="unpack_target" value="untar"/>
- <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
- <param name="gcc_version" value="${AVRGCC-VERSION}"/>
- <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
- <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
- <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux32.tar.bz2"/>
- <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
- </antcall>
</target>
<target name="linux64-build" depends="linux-libastyle-x86" description="Build linux (64-bit) version">
@@ -782,15 +725,6 @@
</copy>
<delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
- <antcall target="avr-toolchain-bundle">
- <param name="unpack_target" value="untar"/>
- <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
- <param name="gcc_version" value="${AVRGCC-VERSION}"/>
- <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
- <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
- <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux64.tar.bz2"/>
- <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
- </antcall>
</target>
<target name="linux-jvm-noop"/>
@@ -987,16 +921,6 @@
<antcall target="windows-build-avr-toolchain" />
<antcall target="unzip">
- <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
- <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
- <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
- <param name="dest_folder" value="${staging_folder}" />
- </antcall>
- <copy file="windows/libastylej-2.05.1/AStylej.dll" todir="windows/work/lib" />
- <copy file="windows/msvcp100.dll" todir="windows/work" />
- <copy file="windows/msvcr100.dll" todir="windows/work" />
-
- <antcall target="unzip">
<param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
<param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
<param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
@@ -1070,15 +994,6 @@
</target>
<target name="windows-build-avr-toolchain">
- <antcall target="avr-toolchain-bundle">
- <param name="unpack_target" value="unzip"/>
- <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-mingw32.zip"/>
- <param name="gcc_version" value="${AVRGCC-VERSION}"/>
- <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-w64-mingw32.zip"/>
- <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
- <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-windows.zip"/>
- <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
- </antcall>
</target>
<target name="windows-run" depends="build,start"/>
Reference in a new issue View git blame Copy permalink