summaryrefslogtreecommitdiff
path: root/sci-mathematics/pspp/files/pspp-1.2.0-fix-gcc10.patch
diff options
context:
space:
mode:
Diffstat (limited to 'sci-mathematics/pspp/files/pspp-1.2.0-fix-gcc10.patch')
-rw-r--r--sci-mathematics/pspp/files/pspp-1.2.0-fix-gcc10.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-fix-gcc10.patch b/sci-mathematics/pspp/files/pspp-1.2.0-fix-gcc10.patch
new file mode 100644
index 000000000000..d228ccc42596
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-1.2.0-fix-gcc10.patch
@@ -0,0 +1,30 @@
+Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=614bbfbc4be1f4f47d55d3fbee9ae20f3a9955bb
+Gentoo Bug: https://bugs.gentoo.org/708548
+
+commit 614bbfbc4be1f4f47d55d3fbee9ae20f3a9955bb
+Author: Ben Pfaff <blp@cs.stanford.edu>
+Date: Fri Nov 16 20:27:30 2018 -0800
+
+ psppire: Fix multiple definitions of align_enum_type and two others.
+
+ These were defined in both psppire-dict.c and widgets.c, which causes a
+ problem building with -fno-common (which is desirable because it allows
+ Address Sanitizer to work better).
+
+diff --git a/src/ui/gui/widgets.c b/src/ui/gui/widgets.c
+index 26a5dac4f..6ce129249 100644
+--- a/src/ui/gui/widgets.c
++++ b/src/ui/gui/widgets.c
+@@ -171,9 +171,9 @@ enum_to_string (const GValue *src, GValue *dest)
+
+
+
+-GType align_enum_type;
+-GType measure_enum_type;
+-GType role_enum_type;
++extern GType align_enum_type;
++extern GType measure_enum_type;
++extern GType role_enum_type;
+
+
+ extern const GEnumValue align[];