diff options
Diffstat (limited to 'dev-embedded/arduino/files')
-rw-r--r-- | dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch | 38 | ||||
-rw-r--r-- | dev-embedded/arduino/files/arduino-1.0.3-script.patch | 20 |
2 files changed, 0 insertions, 58 deletions
diff --git a/dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch b/dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch deleted file mode 100644 index afde2e05b661..000000000000 --- a/dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- arduino-1.0.1/build/build.xml 2012-04-09 00:16:12.000000000 +0100 -+++ arduino-1.0.1/build/build.xml 2012-06-25 06:12:09.000000000 +0100 -@@ -24,9 +24,9 @@ - <fileset dir=".." id="runtime.jars"> - <include name="core/core.jar" /> - <include name="app/pde.jar" /> -- <include name="app/lib/ecj.jar" /> -+<!-- <include name="app/lib/ecj.jar" /> --> - <include name="app/lib/jna.jar" /> -- <include name="app/lib/RXTXcomm.jar" /> -+<!-- <include name="app/lib/RXTXcomm.jar" /> --> - <include name="app/lib/ant.jar" /> - <include name="app/lib/ant-launcher.jar" /> - </fileset> -@@ -361,16 +361,18 @@ - </target> - - <target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version"> -- <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" /> -- <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" /> -+<!-- <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" /> --> -+<!-- <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" /> --> - -- <chmod perm="755" file="linux/work/hardware/tools/avrdude" /> -+<!-- <chmod perm="755" file="linux/work/hardware/tools/avrdude" /> --> - - <!-- Unzip AVR tools --> -- <exec executable="tar" dir="linux/work/hardware"> -+<!-- Removed by Paulj - use system installed instead --> -+<!-- <exec executable="tar" dir="linux/work/hardware"> - <arg value="-xjf"/> - <arg value="../../avr_tools_linux64.tar.bz2"/> -- </exec> -+ </exec> -+--> - </target> - - <target name="linux32-run" depends="linux32-build" diff --git a/dev-embedded/arduino/files/arduino-1.0.3-script.patch b/dev-embedded/arduino/files/arduino-1.0.3-script.patch deleted file mode 100644 index b4accc8959a1..000000000000 --- a/dev-embedded/arduino/files/arduino-1.0.3-script.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino -index b5eb9db..3f3b4aa 100644 ---- a/build/linux/dist/arduino -+++ b/build/linux/dist/arduino -@@ -10,11 +10,13 @@ for LIB in \ - lib/*.jar \ - ; - do -- CLASSPATH="${CLASSPATH}:${LIB}" -+ CLASSPATH="${CLASSPATH+$CLASSPATH:}${LIB}" -+ - done -+CLASSPATH="${CLASSPATH+$CLASSPATH:}:$(java-config -dp rxtx-2)" - export CLASSPATH - --LD_LIBRARY_PATH=`pwd`/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} -+LD_LIBRARY_PATH="$(java-config -di rxtx-2)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" - export LD_LIBRARY_PATH - - export PATH="${APPDIR}/java/bin:${PATH}" |