| 1 |
commit: cd260d9a9fdb2c2a8f0ef7b4e947c7df0ef1d2a2 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 15 01:21:32 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 15 01:21:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd260d9a |
| 7 |
|
| 8 |
app-admin/tripwire: update EAPI 6 -> 7, workaround GCC 11 failure |
| 9 |
|
| 10 |
Set C++ standard to c++14 rather than perform a huge sed on the byte type. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/786465 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
app-admin/tripwire/tripwire-2.4.3.7.ebuild | 15 ++++++++++++--- |
| 16 |
1 file changed, 12 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-admin/tripwire/tripwire-2.4.3.7.ebuild b/app-admin/tripwire/tripwire-2.4.3.7.ebuild |
| 19 |
index 423a09ff991..306f4125452 100644 |
| 20 |
--- a/app-admin/tripwire/tripwire-2.4.3.7.ebuild |
| 21 |
+++ b/app-admin/tripwire/tripwire-2.4.3.7.ebuild |
| 22 |
@@ -1,7 +1,7 @@ |
| 23 |
# Copyright 1999-2021 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
-EAPI=6 |
| 27 |
+EAPI=7 |
| 28 |
|
| 29 |
inherit autotools flag-o-matic |
| 30 |
|
| 31 |
@@ -36,8 +36,17 @@ src_configure() { |
| 32 |
# see #32613, #45823, and others. |
| 33 |
# -taviso@g.o |
| 34 |
strip-flags |
| 35 |
- append-cppflags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing |
| 36 |
- econf $(use_enable ssl openssl) $(use_enable static) |
| 37 |
+ |
| 38 |
+ append-cppflags -DCONFIG_DIR='"\"/etc/tripwire\""' |
| 39 |
+ append-cflags -fno-strict-aliasing |
| 40 |
+ |
| 41 |
+ # "integer.cpp:1162:24: error: reference to ‘byte’ is ambiguous" |
| 42 |
+ # bug #786465 |
| 43 |
+ append-cxxflags -std=c++14 |
| 44 |
+ |
| 45 |
+ econf \ |
| 46 |
+ $(use_enable ssl openssl) \ |
| 47 |
+ $(use_enable static) |
| 48 |
} |
| 49 |
|
| 50 |
src_install() { |
Archives