summaryrefslogtreecommitdiff
path: root/development/Arduino/patches
diff options
context:
space:
mode:
authorMario Preksavec <mario@slackware.hr>2022-01-07 04:02:40 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-01-13 08:58:48 +0700
commita3d2cdb408fded03b54318a302b2186115d51a83 (patch)
treea65492e2ff8efcac8b57bc1bfb367ea24977861d /development/Arduino/patches
parent65a7a4e0156c587f77fd1d94b984011b338004a8 (diff)
downloadslackbuilds-a3d2cdb408fded03b54318a302b2186115d51a83.tar.gz
development/Arduino: Updated for version 1.8.19.
Signed-off-by: Mario Preksavec <mario@slackware.hr> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'development/Arduino/patches')
-rw-r--r--development/Arduino/patches/avr-gcc6-fix.patch117
-rw-r--r--development/Arduino/patches/gcc-add-missing-isl-includes.patch13
-rw-r--r--development/Arduino/patches/toolchain-fixes.diff65
3 files changed, 78 insertions, 117 deletions
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
- <http://www.gnu.org/licenses/>. */
--#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 <bug-gnu-gperf@gnu.org>."
- #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
- <http://www.gnu.org/licenses/>. */
--#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 <isl/schedule.h>
+ #include <isl/ast_build.h>
+ #include <isl/schedule_node.h>
++#include <isl/id.h>
++#include <isl/space.h>
+
+ 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