diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-02-27 07:16:03 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-01 11:12:16 +0000 |
commit | 605dcc2ad8e37b84889995ec1f8799ebcebad991 (patch) | |
tree | 6b8fe5b340178ab42b22d3a298c46508c31d9912 | |
parent | b7fdc5b4d9d9e273e1006f184e8688dbc329b621 (diff) | |
download | poky-605dcc2ad8e37b84889995ec1f8799ebcebad991.tar.gz |
kea: Fix configure test error with gcc11
Since the test program fails to compile, configure thinks compiler is
not having thread support and bails out
(From OE-Core rev: 232f97405a3e69cf9e54d4de0a8f1593da747603)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 61 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/kea/files/0001-ax_cpp11.m4-Include-memory-header.patch b/meta/recipes-connectivity/kea/files/0001-ax_cpp11.m4-Include-memory-header.patch new file mode 100644 index 0000000000..4978cae87c --- /dev/null +++ b/meta/recipes-connectivity/kea/files/0001-ax_cpp11.m4-Include-memory-header.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From 5314a4815006e3a42f3ce265d1597db700cdb784 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 26 Feb 2021 23:14:20 -0800 | ||
4 | Subject: [PATCH] ax_cpp11.m4: Include <memory> header | ||
5 | |||
6 | This is needed for std::shared_ptr | ||
7 | GCC-11 throws errors if header is not included | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/isc-projects/kea/pull/120] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | m4macros/ax_cpp11.m4 | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | --- a/m4macros/ax_cpp11.m4 | ||
16 | +++ b/m4macros/ax_cpp11.m4 | ||
17 | @@ -182,6 +182,7 @@ for retry in "none" "--std=c++11" "--std | ||
18 | AC_COMPILE_IFELSE( | ||
19 | [AC_LANG_PROGRAM( | ||
20 | [#include <thread> | ||
21 | + #include <memory> | ||
22 | std::shared_ptr<std::thread> th;], | ||
23 | [th.reset(new std::thread([[]]() { return; })); | ||
24 | th->join();])], | ||
diff --git a/meta/recipes-connectivity/kea/files/0001-include-limits.h.patch b/meta/recipes-connectivity/kea/files/0001-include-limits.h.patch new file mode 100644 index 0000000000..3856b3d523 --- /dev/null +++ b/meta/recipes-connectivity/kea/files/0001-include-limits.h.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 7bca122e15bbe98c7b8da851ef3e1cf9a714afd9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 26 Feb 2021 23:31:15 -0800 | ||
4 | Subject: [PATCH] include limits.h | ||
5 | |||
6 | Fixes build with gcc11 | ||
7 | backend_selector.cc:61:35: error: 'numeric_limits' is not a member of 'std' | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/isc-projects/kea/pull/120] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | src/lib/exceptions/exceptions.h | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | --- a/src/lib/database/backend_selector.cc | ||
16 | +++ b/src/lib/database/backend_selector.cc | ||
17 | @@ -6,7 +6,7 @@ | ||
18 | |||
19 | #include <database/backend_selector.h> | ||
20 | #include <exceptions/exceptions.h> | ||
21 | -#include <climits> | ||
22 | +#include <limits> | ||
23 | #include <sstream> | ||
24 | |||
25 | using namespace isc::data; | ||
26 | --- a/src/lib/dhcpsrv/subnet_id.h | ||
27 | +++ b/src/lib/dhcpsrv/subnet_id.h | ||
28 | @@ -10,6 +10,7 @@ | ||
29 | #include <exceptions/exceptions.h> | ||
30 | #include <stdint.h> | ||
31 | #include <typeinfo> | ||
32 | +#include <limits> | ||
33 | |||
34 | namespace isc { | ||
35 | namespace dhcp { | ||
diff --git a/meta/recipes-connectivity/kea/kea_1.8.2.bb b/meta/recipes-connectivity/kea/kea_1.8.2.bb index 3dc4f6af70..fe10d90620 100644 --- a/meta/recipes-connectivity/kea/kea_1.8.2.bb +++ b/meta/recipes-connectivity/kea/kea_1.8.2.bb | |||
@@ -18,6 +18,8 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ | |||
18 | file://fix-multilib-conflict.patch \ | 18 | file://fix-multilib-conflict.patch \ |
19 | file://fix_pid_keactrl.patch \ | 19 | file://fix_pid_keactrl.patch \ |
20 | file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ | 20 | file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ |
21 | file://0001-ax_cpp11.m4-Include-memory-header.patch \ | ||
22 | file://0001-include-limits.h.patch \ | ||
21 | " | 23 | " |
22 | SRC_URI[sha256sum] = "486ca7abedb9d6fdf8e4344ad8688d1171f2ef0f5506d118988aadeae80a1d39" | 24 | SRC_URI[sha256sum] = "486ca7abedb9d6fdf8e4344ad8688d1171f2ef0f5506d118988aadeae80a1d39" |
23 | 25 | ||