From a3d2cdb408fded03b54318a302b2186115d51a83 Mon Sep 17 00:00:00 2001 From: Mario Preksavec Date: Fri, 7 Jan 2022 04:02:40 +0100 Subject: development/Arduino: Updated for version 1.8.19. Signed-off-by: Mario Preksavec Signed-off-by: Willy Sudiarto Raharjo --- development/Arduino/Arduino.SlackBuild | 95 +++++++------ development/Arduino/Arduino.info | 148 ++++++++++++--------- development/Arduino/patches/avr-gcc6-fix.patch | 117 ---------------- .../patches/gcc-add-missing-isl-includes.patch | 13 ++ development/Arduino/patches/toolchain-fixes.diff | 65 +++++++++ 5 files changed, 218 insertions(+), 220 deletions(-) delete mode 100644 development/Arduino/patches/avr-gcc6-fix.patch create mode 100644 development/Arduino/patches/gcc-add-missing-isl-includes.patch create mode 100644 development/Arduino/patches/toolchain-fixes.diff diff --git a/development/Arduino/Arduino.SlackBuild b/development/Arduino/Arduino.SlackBuild index bc51489b31..fda9811f7a 100644 --- a/development/Arduino/Arduino.SlackBuild +++ b/development/Arduino/Arduino.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Arduino -# Copyright 2015, 2016, 2017 Mario Preksavec, Zagreb, Croatia +# Copyright 2015, 2022 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,46 +25,54 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Arduino -VERSION=${VERSION:-1.8.3} +VERSION=${VERSION:-1.8.19} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -# Documentation -REFERENCE=${REFERENCE:-1.6.6-3} -GALILEO=${GALILEO:-1.6.2} -EDISON=${EDISON:-1.6.2} +# Examples +EXAMPLES=${EXAMPLES:-1.9.1} # Libraries -FIRMATA=${FIRMATA:-2.5.6} -BRIDGE=${BRIDGE:-1.6.3} -ROBOT_CONTROL=${ROBOT_CONTROL:-1.0.3} -ROBOT_MOTOR=${ROBOT_MOTOR:-1.0.2} -ROBOTIRREMOTE=${ROBOTIRREMOTE:-1.0.2} -SPACEBREWYUN=${SPACEBREWYUN:-1.0.1} +ETHERNET=${ETHERNET:-2.0.0} +GSM=${GSM:-1.0.6} +STEPPER=${STEPPER:-1.1.3} +TFT=${TFT:-1.0.6} +WIFI=${WIFI:-1.2.7} +FIRMATA=${FIRMATA:-2.5.8} +BRIDGE=${BRIDGE:-1.7.0} +ROBOT_CONTROL=${ROBOT_CONTROL:-1.0.4} +ROBOT_MOTOR=${ROBOT_MOTOR:-1.0.3} +ROBOTIRREMOTE=${ROBOTIRREMOTE:-2.0.0} +SPACEBREWYUN=${SPACEBREWYUN:-1.0.2} TEMBOO=${TEMBOO:-1.2.1} ESPLORA=${ESPLORA:-1.0.4} MOUSE=${MOUSE:-1.0.1} -KEYBOARD=${KEYBOARD:-1.0.1} -SD=${SD:-1.1.1} -SERVO=${SERVO:-1.1.2} -ADAFRUIT=${ADAFRUIT:-1.6.4} -WIFI101UPDATER=${WIFI101UPDATER:-0.9.1} -LIBASTYLEJ=${LIBASTYLEJ:-2.05.1-3} -LIBLISTSERIALS=${LIBLISTSERIALS:-1.4.0} -ARDUINOBUILDER=${ARDUINOBUILDER:-1.3.25} -AVRDUDE=${AVRDUDE:-6.3.0-arduino9} -ARDUINOOTA=${ARDUINOOTA:-1.1.1} +KEYBOARD=${KEYBOARD:-1.0.2} +SD=${SD:-1.2.4} +SERVO=${SERVO:-1.1.8} +LIQUIDCRYSTAL=${LIQUIDCRYSTAL:-1.0.7} +ADAFRUIT=${ADAFRUIT:-1.11.3} +WIFI101UPDATER=${WIFI101UPDATER:-0.12.0} +LIBASTYLEJ=${LIBASTYLEJ:-2.05.1-5} +LIBLISTSERIALS=${LIBLISTSERIALS:-1.4.2-2} +ARDUINOBUILDER=${ARDUINOBUILDER:-1.6.1} +AVRDUDE=${AVRDUDE:-6.3.0-arduino17} +AVRCORE=${AVRCORE:-1.8.3} +ARDUINOOTA=${ARDUINOOTA:-1.3.0} # Toolchain -GCC=${GCC:-4.9.2} -AVR=${AVR:-3.5.3} -AVR_BUILD=${AVR_BUILD:-arduino2} +GCC=${GCC:-7.3.0} +AVR=${AVR:-3.6.1} +AVR_BUILD=${AVR_BUILD:-arduino7} AUTOCONF=${AUTOCONF:-2.64} AUTOMAKE=${AUTOMAKE:-1.11.1} GMP=${GMP:-5.0.2} -MPFR=${MPFR:-3.0.0} +MPFR=${MPFR:-3.1.0} MPC=${MPC:-0.9} +ATMEL_ATMEGA_PACK=${ATMEL_ATMEGA_PACK:-1.4.351} +ATMEL_ATTINY_PACK=${ATMEL_ATTINY_PACK:-1.4.310} +ATMEL_DX_PACK=${ATMEL_DX_PACK:-1.0.27} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -122,23 +130,31 @@ cp $CWD/autoconf-$AUTOCONF.tar.bz2 \ $CWD/gmp-$GMP.tar.bz2 \ $CWD/mpfr-$MPFR.tar.bz2 \ $CWD/mpc-$MPC.tar.gz \ - $CWD/avr-gcc.tar.bz2 \ + $CWD/gcc-$GCC.tar.xz \ $CWD/avr-libc.tar.bz2 \ $CWD/avr8-headers.zip \ $CWD/avr-gdb.tar.bz2 \ + $CWD/Atmel.ATmega_DFP.$ATMEL_ATMEGA_PACK.atpack \ + $CWD/Atmel.ATtiny_DFP.$ATMEL_ATTINY_PACK.atpack \ + $CWD/Atmel.AVR-Dx_DFP.$ATMEL_DX_PACK.atpack \ toolchain-avr-$GCC-atmel$AVR-$AVR_BUILD/ -cp $CWD/patches/avr-gcc6-fix.patch \ +cp $CWD/patches/gcc-add-missing-isl-includes.patch \ toolchain-avr-$GCC-atmel$AVR-$AVR_BUILD/avr-gcc-patches/ # Build toolchain ( cd toolchain-avr-$GCC-atmel$AVR-$AVR_BUILD + patch -p1 <$CWD/patches/toolchain-fixes.diff + chmod +x ./atpack.Dx.build.bash ./tools.bash ./binutils.build.bash ./gcc.build.bash ./avr-libc.build.bash ./gdb.build.bash rm -rf objdir/{info,man,share} + ./atpack.build.bash + ./atpack.tiny.build.bash + ./atpack.Dx.build.bash ) # Copy toolchain to where it can be found (`mv` will preserve some space) @@ -165,14 +181,17 @@ EOF sed -e '//,/<\/antcall>/d' \ -i build/build.xml -# Copy documentation, help files and other shared packages -cp $CWD/reference-$REFERENCE.zip \ - $CWD/Galileo_help_files-$GALILEO.zip \ - $CWD/Edison_help_files-$EDISON.zip \ - $CWD/WiFi101-Updater-ArduinoIDE-Plugin-${WIFI101UPDATER}.zip build/shared/ +# Copy shared packages +cp $CWD/WiFi101-Updater-ArduinoIDE-Plugin-${WIFI101UPDATER}.zip build/shared/ # Copy libraries -cp $CWD/Firmata-$FIRMATA.zip \ +cp $CWD/arduino-examples-$EXAMPLES.zip \ + $CWD/Ethernet-$ETHERNET.zip \ + $CWD/GSM-$GSM.zip \ + $CWD/Stepper-$STEPPER.zip \ + $CWD/TFT-$TFT.zip \ + $CWD/WiFi-$WIFI.zip \ + $CWD/Firmata-$FIRMATA.zip \ $CWD/Bridge-$BRIDGE.zip \ $CWD/Robot_Control-$ROBOT_CONTROL.zip \ $CWD/Robot_Motor-$ROBOT_MOTOR.zip \ @@ -184,10 +203,12 @@ cp $CWD/Firmata-$FIRMATA.zip \ $CWD/Keyboard-$KEYBOARD.zip \ $CWD/SD-$SD.zip \ $CWD/Servo-$SERVO.zip \ - $CWD/Adafruit_CircuitPlayground-$ADAFRUIT.zip \ + $CWD/LiquidCrystal-$LIQUIDCRYSTAL.zip \ + $CWD/Adafruit_Circuit_Playground-$ADAFRUIT.zip \ $CWD/libastylej-$LIBASTYLEJ.zip \ $CWD/liblistSerials-$LIBLISTSERIALS.zip \ - $CWD/arduino-builder-linux$LIB-$ARDUINOBUILDER.tar.bz2 build/ + $CWD/arduino-builder-linux$LIB-$ARDUINOBUILDER.tar.bz2 \ + $CWD/avr-$AVRCORE.tar.bz2 build/ # Finally, build Arduino ( cd build ; ant ) @@ -197,7 +218,7 @@ cd build/linux/work/ # Manual install ensues mkdir -p $PKG/opt/$PRGNAM -mv arduino{,-builder} examples hardware lib libraries reference \ +mv arduino{,-builder} examples hardware lib libraries \ tools{,-builder} $PKG/opt/$PRGNAM # Ownership fixup diff --git a/development/Arduino/Arduino.info b/development/Arduino/Arduino.info index ef272be980..fb9876c40c 100644 --- a/development/Arduino/Arduino.info +++ b/development/Arduino/Arduino.info @@ -1,82 +1,98 @@ PRGNAM="Arduino" -VERSION="1.8.3" +VERSION="1.8.19" HOMEPAGE="https://www.arduino.cc/" -DOWNLOAD="https://github.com/arduino/Arduino/archive/1.8.3/Arduino-1.8.3.tar.gz \ - http://downloads.arduino.cc/reference-1.6.6-3.zip \ - http://downloads.arduino.cc/Galileo_help_files-1.6.2.zip \ - http://downloads.arduino.cc/Edison_help_files-1.6.2.zip \ - https://github.com/arduino-libraries/Firmata/archive/2.5.6/Firmata-2.5.6.zip \ - https://github.com/arduino-libraries/Bridge/archive/1.6.3/Bridge-1.6.3.zip \ - https://github.com/arduino-libraries/Robot_Control/archive/1.0.3/Robot_Control-1.0.3.zip \ - https://github.com/arduino-libraries/Robot_Motor/archive/1.0.2/Robot_Motor-1.0.2.zip \ - https://github.com/arduino-libraries/RobotIRremote/archive/1.0.2/RobotIRremote-1.0.2.zip \ - https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1/SpacebrewYun-1.0.1.zip \ +DOWNLOAD="https://github.com/arduino/Arduino/archive/1.8.19/Arduino-1.8.19.tar.gz \ + https://github.com/arduino/arduino-examples/archive/1.9.1/arduino-examples-1.9.1.zip \ + https://github.com/arduino-libraries/Ethernet/archive/2.0.0/Ethernet-2.0.0.zip \ + https://github.com/arduino-libraries/GSM/archive/1.0.6/GSM-1.0.6.zip \ + https://github.com/arduino-libraries/Stepper/archive/1.1.3/Stepper-1.1.3.zip \ + https://github.com/arduino-libraries/TFT/archive/1.0.6/TFT-1.0.6.zip \ + https://github.com/arduino-libraries/WiFi/archive/1.2.7/WiFi-1.2.7.zip \ + https://github.com/firmata/arduino/archive/2.5.8/Firmata-2.5.8.zip \ + https://github.com/arduino-libraries/Bridge/archive/1.7.0/Bridge-1.7.0.zip \ + https://github.com/arduino-libraries/Robot_Control/archive/1.0.4/Robot_Control-1.0.4.zip \ + https://github.com/arduino-libraries/Robot_Motor/archive/1.0.3/Robot_Motor-1.0.3.zip \ + https://github.com/arduino-libraries/RobotIRremote/archive/2.0.0/RobotIRremote-2.0.0.zip \ + https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.2/SpacebrewYun-1.0.2.zip \ https://github.com/arduino-libraries/Temboo/archive/1.2.1/Temboo-1.2.1.zip \ https://github.com/arduino-libraries/Esplora/archive/1.0.4/Esplora-1.0.4.zip \ https://github.com/arduino-libraries/Mouse/archive/1.0.1/Mouse-1.0.1.zip \ - https://github.com/arduino-libraries/Keyboard/archive/1.0.1/Keyboard-1.0.1.zip \ - https://github.com/arduino-libraries/SD/archive/1.1.1/SD-1.1.1.zip \ - https://github.com/arduino-libraries/Servo/archive/1.1.2/Servo-1.1.2.zip \ - https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.4/Adafruit_CircuitPlayground-1.6.4.zip \ - https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.1/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip \ - http://downloads.arduino.cc/libastylej-2.05.1-3.zip \ - http://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.0.zip \ - http://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.25.tar.bz2 \ - http://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.25.tar.bz2 \ - http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2 \ - http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2 \ - http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_386.tar.bz2 \ - http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_amd64.tar.bz2 \ - https://github.com/arduino/toolchain-avr/archive/4.9.2-atmel3.5.3-arduino2/toolchain-avr-4.9.2-atmel3.5.3-arduino2.tar.gz \ - http://mirror.slackware.hr/sources/Arduino/1.8.3/autoconf-2.64.tar.bz2 \ - http://mirror.slackware.hr/sources/Arduino/1.8.3/automake-1.11.1.tar.bz2 \ - http://mirror.slackware.hr/sources/Arduino/1.8.3/avr-binutils.tar.bz2 \ - http://mirror.slackware.hr/sources/Arduino/1.8.3/gmp-5.0.2.tar.bz2 \ - http://mirror.slackware.hr/sources/Arduino/1.8.3/mpfr-3.0.0.tar.bz2 \ - http://ponce.cc/slackware/sources/repo/mpc-0.9.tar.gz \ - http://mirror.slackware.hr/sources/Arduino/1.8.3/avr-gcc.tar.bz2 \ - http://mirror.slackware.hr/sources/Arduino/1.8.3/avr-libc.tar.bz2 \ - http://mirror.slackware.hr/sources/Arduino/1.8.3/avr8-headers.zip \ - http://mirror.slackware.hr/sources/Arduino/1.8.3/avr-gdb.tar.bz2" -MD5SUM="c07a888c3333ff69ae244064d151b5c2 \ - f04dadd797e5e57149bce626defc7be4 \ - dfa93daedbe9188f20f00308f64f4908 \ - c97d466ee23021ffb0d57c222d93e96f \ - a8e59560c2eb157ab86279f5bf16ff42 \ - 1907c0c1428737804b01f37e50952c6b \ - a6e07c38f564ed7445e361a2c2b691d9 \ - f5b648b60c76a3f2ead085b613279d11 \ - 47ff47fab7b44e482dff47b11148d67f \ - 9a05b22d1977bd48ec33c20dbaad5ef8 \ + https://github.com/arduino-libraries/Keyboard/archive/1.0.2/Keyboard-1.0.2.zip \ + https://github.com/arduino-libraries/SD/archive/1.2.4/SD-1.2.4.zip \ + https://github.com/arduino-libraries/Servo/archive/1.1.8/Servo-1.1.8.zip \ + https://github.com/arduino-libraries/LiquidCrystal/archive/1.0.7/LiquidCrystal-1.0.7.zip \ + https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.11.3/Adafruit_Circuit_Playground-1.11.3.zip \ + https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.12.0/WiFi101-Updater-ArduinoIDE-Plugin-0.12.0.zip \ + http://downloads.arduino.cc/libastylej-2.05.1-5.zip \ + http://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.2-2.zip \ + http://downloads.arduino.cc/tools/arduino-builder-linux32-1.6.1.tar.bz2 \ + http://downloads.arduino.cc/tools/arduino-builder-linux64-1.6.1.tar.bz2 \ + http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-i686-pc-linux-gnu.tar.bz2 \ + http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-x86_64-pc-linux-gnu.tar.bz2 \ + https://downloads.arduino.cc/cores/avr-1.8.3.tar.bz2 \ + http://downloads.arduino.cc/tools/arduinoOTA-1.3.0-linux_386.tar.bz2 \ + http://downloads.arduino.cc/tools/arduinoOTA-1.3.0-linux_amd64.tar.bz2 \ + https://github.com/arduino/toolchain-avr/archive/7.3.0-atmel3.6.1-arduino7/toolchain-avr-7.3.0-atmel3.6.1-arduino7.tar.gz \ + https://ftp.gnu.org/gnu/autoconf/autoconf-2.64.tar.bz2 \ + https://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.bz2 \ + http://downloads.arduino.cc/tools/opensource/Atmel-AVR-GNU-Toolchain/3.6.1/avr-binutils.tar.bz2 \ + https://ftp.gnu.org/gnu/gmp/gmp-5.0.2.tar.bz2 \ + https://ftp.gnu.org/gnu/mpfr/mpfr-3.1.0.tar.bz2 \ + http://repository.timesys.com/buildsources/m/mpc/mpc-0.9/mpc-0.9.tar.gz \ + https://ftp.gnu.org/gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz \ + http://downloads.arduino.cc/tools/opensource/Atmel-AVR-GNU-Toolchain/3.6.1/avr-libc.tar.bz2 \ + http://downloads.arduino.cc/tools/opensource/Atmel-AVR-GNU-Toolchain/3.6.1/avr8-headers.zip \ + http://downloads.arduino.cc/tools/opensource/Atmel-AVR-GNU-Toolchain/3.6.1/avr-gdb.tar.bz2 \ + http://packs.download.atmel.com/Atmel.ATmega_DFP.1.4.351.atpack \ + http://packs.download.atmel.com/Atmel.ATtiny_DFP.1.4.310.atpack \ + http://packs.download.atmel.com/Atmel.AVR-Dx_DFP.1.0.27.atpack" +MD5SUM="b51b86f1d8ca30c4553dc241b438c958 \ + 74b09589ac4ae50a07b6fb52f1b02e65 \ + 802ac3652c78a0880f17aa27f3cf3612 \ + 2fd953ff5cb893a2e8abd589f1cf9e40 \ + dfb0923a0fddb2d02a1c7446edfc854d \ + 5b2d8e9b809cdcfd6b46f5a073fb17e0 \ + cd5c085a552bcbe81c5d3c55082e23cf \ + 1381565dcff2932ea8bf2de64f331960 \ + b8b8563ef9703dc1ae7c2d7a2f680cd5 \ + 36caacb88199d8a95b9af5bf3e65abd4 \ + ac371dc0472efc32293657af906650c6 \ + 7856560f6a60cd328785f34f3f58e32a \ + 0a649577bf617338a9ccbaf83a6d07ba \ 385252899ccd98f3655b98656a35b72a \ b066c4b117cd035b4e941016e04617af \ 39018b239c31f89e97cab344c0d42fca \ - d07885c5f18c6ead722c5e28e60bebde \ - 0ed3ff686c2146c4e9b14b2f657d33aa \ - 51b6efddceb1a4a7ae2728f5a081f64c \ - 206edaa76a48c2c358db305b58d4424a \ - 6883392f3731a274a8b15c9fd91b3eec \ - 3f6fd60bfe51ce7a7543671cb638ffbb \ - 997fe95d59d38c2e5f8cc112f528e515 \ - ebbf050c20f1be71831330c91df329f8 \ - 8551f97123df2f31ec05a45551ca79b5 \ - ce891cbe1bf01f6a11e4f5833e7ff8df \ - 723125fb4b9d59b8e9c8ee5fb843911e \ - 28427f1fe98686211d9fdc2b51c593f7 \ - 1b437df1df2fef78a5375c9c62ff313a \ - 1f9cb13309a421e43379dcfc38707395 \ + fd3d73a9817159f9260372ceb7fa3cef \ + baaab729f4b393f6241d3e90458176db \ + c0063b88b10266fb90634991cc973724 \ + 06a6a913262d17e65367c0819e69cbec \ + 4bcbb09a86bb7479ad5f844f944b34fe \ + 96e77fa2f696fd1d75cfb536fd0890dc \ + d2cbb4d8a7973e7e32480044b7a45a1d \ + 959f7d41f8cafe4a98de6bd454d83980 \ + 4ff1668e956935638d76c93e0d082916 \ + bcf1da478a801dc79e330150add7f21f \ + 03189d1c410f31f759d2b8061c627022 \ + 70a6d91bfbf7543f28eb105b03b8b1d7 \ + 2d985ca272e4bd9774078ae9c2cb4077 \ + 0026275a9e820bd67a4ab3304bb36054 \ + 67dffddcefa50f199b6465f19171ade8 \ + c16f84b6d5b18e00327820c38b17daf7 \ ef400d672005e0be21e0d20648169074 \ c2972c4d9b3e29c03d5f2af86249876f \ - 4f3a24017a083e1bc13ebe0cd868b032 \ + a4def5b7f4923a5e61d0c34e33165434 \ 0bbaedc82fb30315b06b1588b9077cd3 \ - f45bac3584922c8004a10060ab1a8f9f \ + 238ae4a15cc3a5049b723daef5d17938 \ 0d6acab8d214bd7d1fbbc593e83dd00d \ - 61446b033b5d9f37b71a03dd6eb8db8f \ - 1ce93dad526aab4d564462d9301f2b62 \ - 5a96c01db89ccdc98e7b7c56267d252d \ - 97a8ec640265cc5ff8a50e599ab55367" + be2da21680f27624f3a87055c4ba5af2 \ + 9de9bf4c5622706eba2f2e3c57eb6e11 \ + ad0ec1ac892e08a5a9275ad97dffe2c7 \ + 97a8ec640265cc5ff8a50e599ab55367 \ + 3b68dda26d68f570e6b3c874a7174f29 \ + 075a7e297950d1c226c0a6c06a737da8 \ + 37c2778af2ce01aea6090689326617bb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="apache-ant jdk" +REQUIRES="apache-ant jdk guile2.0" MAINTAINER="Mario Preksavec" EMAIL="mario at slackware dot hr" diff --git a/development/Arduino/patches/avr-gcc6-fix.patch b/development/Arduino/patches/avr-gcc6-fix.patch deleted file mode 100644 index 89579566c5..0000000000 --- a/development/Arduino/patches/avr-gcc6-fix.patch +++ /dev/null @@ -1,117 +0,0 @@ ---- gcc/cp/Make-lang.in -+++ gcc/cp/Make-lang.in -@@ -112,7 +112,7 @@ else - # deleting the $(srcdir)/cp/cfns.h file. - $(srcdir)/cp/cfns.h: - endif -- gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \ -+ gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L C++ \ - $(srcdir)/cp/cfns.gperf --output-file $(srcdir)/cp/cfns.h - - # ---- gcc/cp/cfns.gperf -+++ gcc/cp/cfns.gperf -@@ -1,3 +1,5 @@ -+%language=C++ -+%define class-name libc_name - %{ - /* Copyright (C) 2000-2016 Free Software Foundation, Inc. - -@@ -16,14 +18,6 @@ for more details. - You should have received a copy of the GNU General Public License - along with GCC; see the file COPYING3. If not see - . */ --#ifdef __GNUC__ --__inline --#endif --static unsigned int hash (const char *, unsigned int); --#ifdef __GNUC__ --__inline --#endif --const char * libc_name_p (const char *, unsigned int); - %} - %% - # The standard C library functions, for feeding to gperf; the result is used ---- gcc/cp/cfns.h -+++ gcc/cp/cfns.h -@@ -1,5 +1,5 @@ --/* ANSI-C code produced by gperf version 3.0.3 */ --/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf */ -+/* C++ code produced by gperf version 3.0.4 */ -+/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L C++ --output-file cfns.h cfns.gperf */ - - #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ - && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ -@@ -28,7 +28,7 @@ - #error "gperf generated tables don't work with this execution character set. Please report a bug to ." - #endif - --#line 1 "cfns.gperf" -+#line 3 "cfns.gperf" - - /* Copyright (C) 2000-2016 Free Software Foundation, Inc. - -@@ -47,25 +47,18 @@ for more details. - You should have received a copy of the GNU General Public License - along with GCC; see the file COPYING3. If not see - . */ --#ifdef __GNUC__ --__inline --#endif --static unsigned int hash (const char *, unsigned int); --#ifdef __GNUC__ --__inline --#endif --const char * libc_name_p (const char *, unsigned int); - /* maximum key range = 391, duplicates = 0 */ - --#ifdef __GNUC__ --__inline --#else --#ifdef __cplusplus --inline --#endif --#endif --static unsigned int --hash (register const char *str, register unsigned int len) -+class libc_name -+{ -+private: -+ static inline unsigned int hash (const char *str, unsigned int len); -+public: -+ static const char *libc_name_p (const char *str, unsigned int len); -+}; -+ -+inline unsigned int -+libc_name::hash (register const char *str, register unsigned int len) - { - static const unsigned short asso_values[] = - { -@@ -122,14 +115,8 @@ hash (register const char *str, register unsigned int len) - return hval + asso_values[(unsigned char)str[len - 1]]; - } - --#ifdef __GNUC__ --__inline --#ifdef __GNUC_STDC_INLINE__ --__attribute__ ((__gnu_inline__)) --#endif --#endif - const char * --libc_name_p (register const char *str, register unsigned int len) -+libc_name::libc_name_p (register const char *str, register unsigned int len) - { - enum - { ---- gcc/cp/except.c -+++ gcc/cp/except.c -@@ -1040,7 +1040,8 @@ nothrow_libfn_p (const_tree fn) - unless the system headers are playing rename tricks, and if - they are, we don't want to be confused by them. */ - id = DECL_NAME (fn); -- return !!libc_name_p (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id)); -+ return !!libc_name::libc_name_p (IDENTIFIER_POINTER (id), -+ IDENTIFIER_LENGTH (id)); - } - - /* Returns nonzero if an exception of type FROM will be caught by a diff --git a/development/Arduino/patches/gcc-add-missing-isl-includes.patch b/development/Arduino/patches/gcc-add-missing-isl-includes.patch new file mode 100644 index 0000000000..d575ced3d2 --- /dev/null +++ b/development/Arduino/patches/gcc-add-missing-isl-includes.patch @@ -0,0 +1,13 @@ +diff --git a/gcc/graphite.h b/gcc/graphite.h +index d22c4f2..e69edf2 100644 +--- a/gcc/graphite.h ++++ b/gcc/graphite.h +@@ -37,6 +37,8 @@ along with GCC; see the file COPYING3. If not see + #include + #include + #include ++#include ++#include + + typedef struct poly_dr *poly_dr_p; + diff --git a/development/Arduino/patches/toolchain-fixes.diff b/development/Arduino/patches/toolchain-fixes.diff new file mode 100644 index 0000000000..fc34e5493c --- /dev/null +++ b/development/Arduino/patches/toolchain-fixes.diff @@ -0,0 +1,65 @@ +--- toolchain-avr-7.3.0-atmel3.6.1-arduino7/build.conf.orig 2020-05-26 15:42:08.000000000 +0200 ++++ toolchain-avr-7.3.0-atmel3.6.1-arduino7/build.conf 2022-01-06 15:07:46.251140445 +0100 +@@ -17,7 +17,11 @@ + # MPC_VERSION=0.9 + + GCC_VERSION=7.3.0 ++AUTOCONF_VERSION=2.64 ++AUTOMAKE_VERSION=1.11.1 ++GMP_VERSION=5.0.2 + MPFR_VERSION=3.1.0 ++MPC_VERSION=0.9 + + ATMEL_ATMEGA_PACK_VERSION=1.4.351 + ATMEL_ATMEGA_PACK_FILENAME=Atmel.ATmega_DFP.${ATMEL_ATMEGA_PACK_VERSION} +@@ -43,7 +43,6 @@ + GREP=grep + + #fallback for grep without pearl regexp +-SOURCES_README="$(wget -O - ${AVR_SOURCES}/SOURCES.README 2>/dev/null)" + [ -z "$GCC_VERSION" ] && GCC_VERSION="$(echo "$SOURCES_README" | $GREP "GCC" | egrep -o "([0-9]{1,}\.)+[0-9]{1,}")" + [ -z "$AUTOMAKE_VERSION" ] && AUTOMAKE_VERSION="$(echo "$SOURCES_README" | $GREP "automake" | egrep -o "([0-9]{1,}\.)+[0-9]{1,}")" + [ -z "$AUTOCONF_VERSION" ] && AUTOCONF_VERSION="$(echo "$SOURCES_README" | $GREP "autoconf" | egrep -o "([0-9]{1,}\.)+[0-9]{1,}")" +--- toolchain-avr-7.3.0-atmel3.6.1-arduino7/gcc.build.bash.orig 2020-05-26 15:42:08.000000000 +0200 ++++ toolchain-avr-7.3.0-atmel3.6.1-arduino7/gcc.build.bash 2022-01-06 16:00:19.640966313 +0100 +@@ -60,6 +60,7 @@ + + # Apply the right patchset + cd gcc && patch -p1 < ../avr-gcc-patches/atmel-patches-gcc.7.3.0-arduino2.patch && cd .. ++cd gcc && patch -p1 < ../avr-gcc-patches/gcc-add-missing-isl-includes.patch && cd .. + + #pushd gcc + #pushd gcc/config/avr/ +--- toolchain-avr-7.3.0-atmel3.6.1-arduino7/atpack.Dx.build.bash.orig 2020-05-26 15:42:08.000000000 +0200 ++++ toolchain-avr-7.3.0-atmel3.6.1-arduino7/atpack.Dx.build.bash 2022-01-07 02:53:31.621802110 +0100 +@@ -17,7 +17,7 @@ + + source build.conf + +-wget ${ATMEL_DX_PACK_URL} ++#wget ${ATMEL_DX_PACK_URL} + + mkdir -p atpack + cd atpack +--- toolchain-avr-7.3.0-atmel3.6.1-arduino7/atpack.build.bash.orig 2020-05-26 15:42:08.000000000 +0200 ++++ toolchain-avr-7.3.0-atmel3.6.1-arduino7/atpack.build.bash 2022-01-07 02:53:35.029801922 +0100 +@@ -17,7 +17,7 @@ + + source build.conf + +-wget ${ATMEL_ATMEGA_PACK_URL} ++#wget ${ATMEL_ATMEGA_PACK_URL} + + mkdir -p atpack + cd atpack +--- toolchain-avr-7.3.0-atmel3.6.1-arduino7/atpack.tiny.build.bash.orig 2020-05-26 15:42:08.000000000 +0200 ++++ toolchain-avr-7.3.0-atmel3.6.1-arduino7/atpack.tiny.build.bash 2022-01-07 02:53:38.116801752 +0100 +@@ -17,7 +17,7 @@ + + source build.conf + +-wget ${ATMEL_ATTINY_PACK_URL} ++#wget ${ATMEL_ATTINY_PACK_URL} + + mkdir -p atpack + cd atpack -- cgit v1.2.3-65-gdbad