| 1 |
commit: 19c04306aa8283cc7adf787a1067aa75537ef14e |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 15 03:14:50 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 15 03:15:11 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19c04306 |
| 7 |
|
| 8 |
dev-lang/maude: fix build with GCC 11 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/787851 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/maude-2.7-fix-build-with-gcc11.patch | 60 ++++++++++++++++++++++ |
| 14 |
dev-lang/maude/maude-2.7.ebuild | 3 +- |
| 15 |
2 files changed, 62 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/maude/files/maude-2.7-fix-build-with-gcc11.patch b/dev-lang/maude/files/maude-2.7-fix-build-with-gcc11.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..b903d50e22b |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-lang/maude/files/maude-2.7-fix-build-with-gcc11.patch |
| 22 |
@@ -0,0 +1,60 @@ |
| 23 |
+https://bugs.gentoo.org/787851 |
| 24 |
+ |
| 25 |
+From 6d448928a88f586195dadd9fae9cb1b19e589d94 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Sam James <sam@g.o> |
| 27 |
+Date: Tue, 15 Jun 2021 03:05:34 +0000 |
| 28 |
+Subject: [PATCH] Fix build with GCC 11 |
| 29 |
+diff --git a/src/ObjectSystem/configSymbol.hh b/src/ObjectSystem/configSymbol.hh |
| 30 |
+index 90b00d9..d037dab 100644 |
| 31 |
+--- a/src/ObjectSystem/configSymbol.hh |
| 32 |
++++ b/src/ObjectSystem/configSymbol.hh |
| 33 |
+@@ -50,7 +50,7 @@ public: |
| 34 |
+ private: |
| 35 |
+ struct symbolLt |
| 36 |
+ { |
| 37 |
+- bool operator()(const Symbol* d1, const Symbol* d2) |
| 38 |
++ bool operator()(const Symbol* d1, const Symbol* d2) const |
| 39 |
+ { |
| 40 |
+ return d1->compare(d2) < 0; |
| 41 |
+ } |
| 42 |
+diff --git a/src/ObjectSystem/objectMap.cc b/src/ObjectSystem/objectMap.cc |
| 43 |
+index 0dbcaf0..722aa29 100644 |
| 44 |
+--- a/src/ObjectSystem/objectMap.cc |
| 45 |
++++ b/src/ObjectSystem/objectMap.cc |
| 46 |
+@@ -50,7 +50,7 @@ ConfigSymbol::MessageQueue::markReachableNodes() const |
| 47 |
+ |
| 48 |
+ struct ConfigSymbol::dagNodeLt |
| 49 |
+ { |
| 50 |
+- bool operator()(const DagNode* d1, const DagNode* d2) |
| 51 |
++ bool operator()(const DagNode* d1, const DagNode* d2) const |
| 52 |
+ { |
| 53 |
+ return d1->compare(d2) < 0; |
| 54 |
+ } |
| 55 |
+diff --git a/src/ObjectSystem/objectSystemRewritingContext.hh b/src/ObjectSystem/objectSystemRewritingContext.hh |
| 56 |
+index 33785ec..32f4d94 100644 |
| 57 |
+--- a/src/ObjectSystem/objectSystemRewritingContext.hh |
| 58 |
++++ b/src/ObjectSystem/objectSystemRewritingContext.hh |
| 59 |
+@@ -62,7 +62,7 @@ protected: |
| 60 |
+ private: |
| 61 |
+ struct dagNodeLt |
| 62 |
+ { |
| 63 |
+- bool operator()(const DagNode* d1, const DagNode* d2) |
| 64 |
++ bool operator()(const DagNode* d1, const DagNode* d2) const |
| 65 |
+ { |
| 66 |
+ return d1->compare(d2) < 0; |
| 67 |
+ } |
| 68 |
+diff --git a/src/Mixfix/entity.hh b/src/Mixfix/entity.hh |
| 69 |
+index eb8ad58..a221de4 100644 |
| 70 |
+--- a/src/Mixfix/entity.hh |
| 71 |
++++ b/src/Mixfix/entity.hh |
| 72 |
+@@ -53,7 +53,7 @@ public: |
| 73 |
+ private: |
| 74 |
+ struct UserLt |
| 75 |
+ { |
| 76 |
+- bool operator()(const User* user1, const User* user2) |
| 77 |
++ bool operator()(const User* user1, const User* user2) const |
| 78 |
+ { |
| 79 |
+ // |
| 80 |
+ // Direct < comparison of unrelated pointers is undefined. But since the casting |
| 81 |
+-- |
| 82 |
+2.32.0 |
| 83 |
|
| 84 |
diff --git a/dev-lang/maude/maude-2.7.ebuild b/dev-lang/maude/maude-2.7.ebuild |
| 85 |
index 01957fb2a5e..72d88da7e51 100644 |
| 86 |
--- a/dev-lang/maude/maude-2.7.ebuild |
| 87 |
+++ b/dev-lang/maude/maude-2.7.ebuild |
| 88 |
@@ -1,4 +1,4 @@ |
| 89 |
-# Copyright 1999-2020 Gentoo Authors |
| 90 |
+# Copyright 1999-2021 Gentoo Authors |
| 91 |
# Distributed under the terms of the GNU General Public License v2 |
| 92 |
|
| 93 |
EAPI=6 |
| 94 |
@@ -32,6 +32,7 @@ PATCHES=( |
| 95 |
"${FILESDIR}/${PN}-2.6-search-datadir.patch" |
| 96 |
"${FILESDIR}/${PN}-2.7-bison-parse-param.patch" |
| 97 |
"${FILESDIR}/${PN}-2.7-AR.patch" |
| 98 |
+ "${FILESDIR}/${PN}-2.7-fix-build-with-gcc11.patch" |
| 99 |
) |
| 100 |
|
| 101 |
src_prepare() { |
Archives