summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2021-05-28 10:14:25 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2021-05-28 10:14:25 +0200
commit2c1afd34dc990f81af715f5b2cad9275e0433a3f (patch)
treeb6305147275e211205bf1cc89d8d7326bdebd361
parent7d1ff6b2ca84f853b00d87ad2f076105d3684fe9 (diff)
downloadptxdist-2c1afd34dc990f81af715f5b2cad9275e0433a3f.tar.gz
ptxdist-2c1afd34dc990f81af715f5b2cad9275e0433a3f.tar.xz
cxxtools: add upstream patches to fix building with gcc 11
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/cxxtools-2.2.1/0001-make-cxxtools-Char-a-trivial-class-by-definining-the.patch24
-rw-r--r--patches/cxxtools-2.2.1/0002-remove-superflous-explicit-assignment-operator-in-cx.patch23
-rw-r--r--patches/cxxtools-2.2.1/series5
3 files changed, 52 insertions, 0 deletions
diff --git a/patches/cxxtools-2.2.1/0001-make-cxxtools-Char-a-trivial-class-by-definining-the.patch b/patches/cxxtools-2.2.1/0001-make-cxxtools-Char-a-trivial-class-by-definining-the.patch
new file mode 100644
index 000000000..160001f48
--- /dev/null
+++ b/patches/cxxtools-2.2.1/0001-make-cxxtools-Char-a-trivial-class-by-definining-the.patch
@@ -0,0 +1,24 @@
+From: =?UTF-8?q?Tommi=20M=C3=A4kitalo?= <tommi@tntnet.org>
+Date: Sun, 24 Jan 2021 17:20:24 +0100
+Subject: [PATCH] make cxxtools::Char a trivial class by definining the default
+ constructor as default
+
+---
+ include/cxxtools/char.h | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/include/cxxtools/char.h b/include/cxxtools/char.h
+index d1ce864b48be..6ce22c78b94a 100644
+--- a/include/cxxtools/char.h
++++ b/include/cxxtools/char.h
+@@ -68,9 +68,7 @@ namespace cxxtools
+ typedef int32_t value_type;
+
+ //! Constructs a character with a value of 0.
+- Char()
+- : _value(0)
+- {}
++ Char() = default;
+
+ //! Constructs a character using the given char as base for the character value.
+ Char(char ch)
diff --git a/patches/cxxtools-2.2.1/0002-remove-superflous-explicit-assignment-operator-in-cx.patch b/patches/cxxtools-2.2.1/0002-remove-superflous-explicit-assignment-operator-in-cx.patch
new file mode 100644
index 000000000..077b4dc49
--- /dev/null
+++ b/patches/cxxtools-2.2.1/0002-remove-superflous-explicit-assignment-operator-in-cx.patch
@@ -0,0 +1,23 @@
+From: =?UTF-8?q?Tommi=20M=C3=A4kitalo?= <tommi@tntnet.org>
+Date: Mon, 27 Apr 2020 11:06:24 +0200
+Subject: [PATCH] remove superflous explicit assignment operator in
+ cxxtools::Char
+
+---
+ include/cxxtools/char.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/include/cxxtools/char.h b/include/cxxtools/char.h
+index 6ce22c78b94a..c5565a022090 100644
+--- a/include/cxxtools/char.h
++++ b/include/cxxtools/char.h
+@@ -112,9 +112,6 @@ namespace cxxtools
+ return Char(0);
+ }
+
+- Char& operator=(const Char& ch)
+- { _value = ch._value; return *this; }
+-
+ /**
+ * @brief Returns the internal value (unsigned 32 bits) of this character.
+ * @return The 32-bit-value of this character.
diff --git a/patches/cxxtools-2.2.1/series b/patches/cxxtools-2.2.1/series
new file mode 100644
index 000000000..e6ed2aac5
--- /dev/null
+++ b/patches/cxxtools-2.2.1/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-make-cxxtools-Char-a-trivial-class-by-definining-the.patch
+0002-remove-superflous-explicit-assignment-operator-in-cx.patch
+# e99261745911c9230bfac0c28510d0cf - git-ptx-patches magic