toolchain-fixes.diff 2.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566
  1. --- toolchain-avr-7.3.0-atmel3.6.1-arduino7/build.conf.orig 2020-05-26 15:42:08.000000000 +0200
  2. +++ toolchain-avr-7.3.0-atmel3.6.1-arduino7/build.conf 2022-01-06 15:07:46.251140445 +0100
  3. @@ -17,7 +17,11 @@
  4. # MPC_VERSION=0.9
  5. GCC_VERSION=7.3.0
  6. +AUTOCONF_VERSION=2.64
  7. +AUTOMAKE_VERSION=1.11.1
  8. +GMP_VERSION=5.0.2
  9. MPFR_VERSION=3.1.0
  10. +MPC_VERSION=0.9
  11. ATMEL_ATMEGA_PACK_VERSION=1.4.351
  12. ATMEL_ATMEGA_PACK_FILENAME=Atmel.ATmega_DFP.${ATMEL_ATMEGA_PACK_VERSION}
  13. @@ -43,7 +43,6 @@
  14. GREP=grep
  15. #fallback for grep without pearl regexp
  16. -SOURCES_README="$(wget -O - ${AVR_SOURCES}/SOURCES.README 2>/dev/null)"
  17. [ -z "$GCC_VERSION" ] && GCC_VERSION="$(echo "$SOURCES_README" | $GREP "GCC" | egrep -o "([0-9]{1,}\.)+[0-9]{1,}")"
  18. [ -z "$AUTOMAKE_VERSION" ] && AUTOMAKE_VERSION="$(echo "$SOURCES_README" | $GREP "automake" | egrep -o "([0-9]{1,}\.)+[0-9]{1,}")"
  19. [ -z "$AUTOCONF_VERSION" ] && AUTOCONF_VERSION="$(echo "$SOURCES_README" | $GREP "autoconf" | egrep -o "([0-9]{1,}\.)+[0-9]{1,}")"
  20. --- toolchain-avr-7.3.0-atmel3.6.1-arduino7/gcc.build.bash.orig 2020-05-26 15:42:08.000000000 +0200
  21. +++ toolchain-avr-7.3.0-atmel3.6.1-arduino7/gcc.build.bash 2022-01-06 16:00:19.640966313 +0100
  22. @@ -60,6 +60,7 @@
  23. # Apply the right patchset
  24. cd gcc && patch -p1 < ../avr-gcc-patches/atmel-patches-gcc.7.3.0-arduino2.patch && cd ..
  25. +cd gcc && patch -p1 < ../avr-gcc-patches/gcc-add-missing-isl-includes.patch && cd ..
  26. #pushd gcc
  27. #pushd gcc/config/avr/
  28. --- toolchain-avr-7.3.0-atmel3.6.1-arduino7/atpack.Dx.build.bash.orig 2020-05-26 15:42:08.000000000 +0200
  29. +++ toolchain-avr-7.3.0-atmel3.6.1-arduino7/atpack.Dx.build.bash 2022-01-07 02:53:31.621802110 +0100
  30. @@ -17,7 +17,7 @@
  31. source build.conf
  32. -wget ${ATMEL_DX_PACK_URL}
  33. +#wget ${ATMEL_DX_PACK_URL}
  34. mkdir -p atpack
  35. cd atpack
  36. --- toolchain-avr-7.3.0-atmel3.6.1-arduino7/atpack.build.bash.orig 2020-05-26 15:42:08.000000000 +0200
  37. +++ toolchain-avr-7.3.0-atmel3.6.1-arduino7/atpack.build.bash 2022-01-07 02:53:35.029801922 +0100
  38. @@ -17,7 +17,7 @@
  39. source build.conf
  40. -wget ${ATMEL_ATMEGA_PACK_URL}
  41. +#wget ${ATMEL_ATMEGA_PACK_URL}
  42. mkdir -p atpack
  43. cd atpack
  44. --- toolchain-avr-7.3.0-atmel3.6.1-arduino7/atpack.tiny.build.bash.orig 2020-05-26 15:42:08.000000000 +0200
  45. +++ toolchain-avr-7.3.0-atmel3.6.1-arduino7/atpack.tiny.build.bash 2022-01-07 02:53:38.116801752 +0100
  46. @@ -17,7 +17,7 @@
  47. source build.conf
  48. -wget ${ATMEL_ATTINY_PACK_URL}
  49. +#wget ${ATMEL_ATTINY_PACK_URL}
  50. mkdir -p atpack
  51. cd atpack