| 1 |
commit: 9cc6e5ae81288c4a3a2c68cdb74368e0378b21a3 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 13 21:30:16 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 14 00:24:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cc6e5ae |
| 7 |
|
| 8 |
net-misc/kea: Fix compiling with GCC 11 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/20798 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
.../kea/files/kea-1.8.2-fix-cxx11-detection.patch | 50 ++++++++++++++++++++++ |
| 16 |
net-misc/kea/kea-1.8.2.ebuild | 5 ++- |
| 17 |
2 files changed, 54 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/net-misc/kea/files/kea-1.8.2-fix-cxx11-detection.patch b/net-misc/kea/files/kea-1.8.2-fix-cxx11-detection.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..867561f2e7e |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-misc/kea/files/kea-1.8.2-fix-cxx11-detection.patch |
| 24 |
@@ -0,0 +1,50 @@ |
| 25 |
+--- a/m4macros/ax_cpp11.m4 |
| 26 |
++++ b/m4macros/ax_cpp11.m4 |
| 27 |
+@@ -182,6 +182,7 @@ |
| 28 |
+ AC_COMPILE_IFELSE( |
| 29 |
+ [AC_LANG_PROGRAM( |
| 30 |
+ [#include <thread> |
| 31 |
++ #include <memory> |
| 32 |
+ std::shared_ptr<std::thread> th;], |
| 33 |
+ [th.reset(new std::thread([[]]() { return; })); |
| 34 |
+ th->join();])], |
| 35 |
+--- a/src/bin/perfdhcp/Makefile.am |
| 36 |
++++ b/src/bin/perfdhcp/Makefile.am |
| 37 |
+@@ -3,7 +3,6 @@ |
| 38 |
+ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib |
| 39 |
+ AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin |
| 40 |
+ AM_CPPFLAGS += $(BOOST_INCLUDES) |
| 41 |
+-AM_CPPFLAGS += -Werror |
| 42 |
+ |
| 43 |
+ AM_CXXFLAGS = $(KEA_CXXFLAGS) |
| 44 |
+ |
| 45 |
+--- a/src/bin/perfdhcp/tests/Makefile.am |
| 46 |
++++ b/src/bin/perfdhcp/tests/Makefile.am |
| 47 |
+@@ -4,7 +4,6 @@ |
| 48 |
+ AM_CPPFLAGS += -I$(srcdir)/.. -I$(builddir)/.. |
| 49 |
+ AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_srcdir)/testdata\" |
| 50 |
+ AM_CPPFLAGS += $(BOOST_INCLUDES) |
| 51 |
+-AM_CPPFLAGS += -Werror |
| 52 |
+ AM_CXXFLAGS = $(KEA_CXXFLAGS) |
| 53 |
+ |
| 54 |
+ if USE_STATIC_LINK |
| 55 |
+--- a/src/lib/database/backend_selector.cc |
| 56 |
++++ b/src/lib/database/backend_selector.cc |
| 57 |
+@@ -7,6 +7,7 @@ |
| 58 |
+ #include <database/backend_selector.h> |
| 59 |
+ #include <exceptions/exceptions.h> |
| 60 |
+ #include <climits> |
| 61 |
++#include <limits> |
| 62 |
+ #include <sstream> |
| 63 |
+ |
| 64 |
+ using namespace isc::data; |
| 65 |
+--- a/src/lib/dhcpsrv/subnet_id.h |
| 66 |
++++ b/src/lib/dhcpsrv/subnet_id.h |
| 67 |
+@@ -10,6 +10,7 @@ |
| 68 |
+ #include <exceptions/exceptions.h> |
| 69 |
+ #include <stdint.h> |
| 70 |
+ #include <typeinfo> |
| 71 |
++#include <limits> |
| 72 |
+ |
| 73 |
+ namespace isc { |
| 74 |
+ namespace dhcp { |
| 75 |
|
| 76 |
diff --git a/net-misc/kea/kea-1.8.2.ebuild b/net-misc/kea/kea-1.8.2.ebuild |
| 77 |
index ef18946d46a..8fa2128e5ae 100644 |
| 78 |
--- a/net-misc/kea/kea-1.8.2.ebuild |
| 79 |
+++ b/net-misc/kea/kea-1.8.2.ebuild |
| 80 |
@@ -13,6 +13,7 @@ if [[ ${PV} = 9999* ]] ; then |
| 81 |
inherit autotools git-r3 |
| 82 |
EGIT_REPO_URI="https://github.com/isc-projects/kea.git" |
| 83 |
else |
| 84 |
+ inherit autotools |
| 85 |
SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz |
| 86 |
ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz" |
| 87 |
[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ |
| 88 |
@@ -39,9 +40,11 @@ BDEPEND="virtual/pkgconfig" |
| 89 |
|
| 90 |
S="${WORKDIR}/${MY_P}" |
| 91 |
|
| 92 |
+PATCHES=( "${FILESDIR}"/${PN}-1.8.2-fix-cxx11-detection.patch ) |
| 93 |
+ |
| 94 |
src_prepare() { |
| 95 |
default |
| 96 |
- [[ ${PV} = *9999 ]] && eautoreconf |
| 97 |
+ eautoreconf |
| 98 |
# Brand the version with Gentoo |
| 99 |
sed -i \ |
| 100 |
-e "/VERSION=/s:'$: Gentoo-${PR}':" \ |
Archives