Skip to content

Commit 7450b42

Browse files
authored
Merge pull request #13 from facchinm/staging
Update to arduino14
2 parents dc4491e + 5fbb83b commit 7450b42

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

avrdude-6.3.build.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ cd objdir
2020
PREFIX=`pwd`
2121
cd -
2222

23-
git clone https://github.com/facchinm/avrdude.git avrdude-6.3 --depth 1 -b staging
23+
git clone https://github.com/facchinm/avrdude.git avrdude-6.3 --depth 1
2424

2525
cd avrdude-6.3
2626

libhidapi.build.bash

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ fi
2626

2727
if [[ $TARGET_OS == "GNU/Linux" ]] ; then
2828

29-
wget https://github.com/gentoo/eudev/archive/v3.2.5.tar.gz
30-
tar xvf v3.2.5.tar.gz
31-
cd eudev-3.2.5
29+
wget https://github.com/gentoo/eudev/archive/v3.1.3.tar.gz
30+
tar xvf v3.1.3.tar.gz
31+
cd eudev-3.1.3
3232
./autogen.sh
3333
./configure --enable-static --disable-gudev --disable-introspection --disable-shared --disable-blkid --disable-kmod --disable-manpages --prefix=$PREFIX $CONFARGS
3434
make clean

package-avrdude.bash

+8-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# along with this program; if not, write to the Free Software
1616
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1717

18-
OUTPUT_VERSION=6.3.0-arduino13
18+
OUTPUT_VERSION=6.3.0-arduino14
1919

2020
export OS=`uname -o || uname`
2121
export TARGET_OS=$OS
@@ -28,6 +28,13 @@ if [[ $CROSS_COMPILE == "mingw" ]] ; then
2828
export TARGET_OS="Windows"
2929
OUTPUT_TAG=i686-w64-mingw32
3030

31+
elif [[ $CROSS_COMPILE == "arm64-cross" ]] ; then
32+
export CC="aarch64-linux-gnu-gcc"
33+
export CXX="aarch64-linux-gnu-g++"
34+
export CROSS_COMPILE_HOST="aarch64-linux-gnu"
35+
export TARGET_OS="GNU/Linux"
36+
OUTPUT_TAG=aarch64-linux-gnu
37+
3138
elif [[ $CROSS_COMPILE == "arm-cross" ]] ; then
3239
export CC="arm-linux-gnueabihf-gcc"
3340
export CXX="arm-linux-gnueabihf-g++"

0 commit comments

Comments
 (0)