Merge master: upgraded avrdude 5 to 6, removed gpio-avrdude

Author: ffissore

.gitignore

@@ -8,5 +8,6 @@ avr8-headers-6.2.0.142/
 binutils-2.23.2
 gcc-4.8.1
 avrdude-5.11.1
+avrdude-6.0.1
 gpio-avrdude-1138
 *.zip

gpio-avrdude-patches/10-gpio-avrdude-1138-silent_bitbang_cmd.patch renamed to avrdude-patches/10-avrdude-6.0.1-silent_bitbang_cmd.patch

@@ -0,0 +1,8 @@
+Index: linuxgpio.c
+===================================================================
+--- linuxgpio.c
++++ linuxgpio.c
+260c260
+<   for (i=0; i<N_PINS; i++) {
+---
+>   for (i=2; i<N_PINS; i++) {

avrdude-patches/20-avrdude-6.0.1-no_gpio0_gpio1.patch

@@ -1,11 +1,16 @@
 #!/bin/bash -ex
 
-if [[ ! -f avrdude-5.11.1.tar.gz  ]] ;
+if [[ ! -f avrdude-6.0.1.tar.gz  ]] ;
 then
-	wget http://download.savannah.gnu.org/releases/avrdude/avrdude-5.11.1.tar.gz
+	wget http://download.savannah.gnu.org/releases/avrdude/avrdude-6.0.1.tar.gz
 fi
 
-tar xfzv avrdude-5.11.1.tar.gz
+tar xfzv avrdude-6.0.1.tar.gz
+
+cd avrdude-6.0.1
+for p in ../avrdude-patches/*.patch; do echo Applying $p; patch -p0 < $p; done
+./bootstrap
+cd -
 
 mkdir -p objdir
 cd objdir
@@ -16,9 +21,10 @@ mkdir -p avrdude-build
 cd avrdude-build
 
 CONFARGS=" \
-	--prefix=$PREFIX"
+	--prefix=$PREFIX \
+	--enable-linuxgpio"
 
-CFLAGS="-w -O2 $CFLAGS" CXXFLAGS="-w -O2 $CXXFLAGS" LDFLAGS="-s $LDFLAGS" ../avrdude-5.11.1/configure $CONFARGS
+CFLAGS="-w -O2 -DHAVE_LINUX_GPIO $CFLAGS" CXXFLAGS="-w -O2 -DHAVE_LINUX_GPIO $CXXFLAGS" LDFLAGS="-s $LDFLAGS" ../avrdude-6.0.1/configure $CONFARGS
 
 if [ -z "$MAKE_JOBS" ]; then
 	MAKE_JOBS="2"

avrdude.build.bash

@@ -13,6 +13,3 @@ rm -rf objdir toolsdir
 ./clean.bash
 ./avrdude.build.bash
 ./clean.bash
-./gpio-avrdude.build.bash
-./clean.bash
-

build.all.bash

@@ -2,7 +2,7 @@
 
 rm -rf autoconf-2.64 automake-1.11.1
 
-rm -rf gcc-4.8.1 gmp-5.0.2 mpc-0.9 mpfr-3.0.0 binutils-2.23.2 avr-libc-1.8.0 avr8-headers-6.2.0.142 avrdude-5.11.1 gpio-avrdude-1138 *-build
+rm -rf gcc-4.8.1 gmp-5.0.2 mpc-0.9 mpfr-3.0.0 binutils-2.23.2 avr-libc-1.8.0 avr8-headers-6.2.0.142 avrdude-6.0.1 *-build
 
 rm -rf objdir/{info,man,share}