diff options
author | Ross Burton <ross@burtonini.com> | 2020-09-03 21:31:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-05 22:19:20 +0100 |
commit | b325f0bf30efe20a65314a819143e94ccf6be469 (patch) | |
tree | d8fec5ea0f69cbbd1f64b047300a151d5d8af8ad /meta/recipes-connectivity | |
parent | b4a4b421bd7d8268c5a7e66b87a7b4281afcbe39 (diff) | |
download | poky-b325f0bf30efe20a65314a819143e94ccf6be469.tar.gz |
kea: bump to 1.7.10
This is the latest release in the 1.7.x series so should be a safe
upgrade, and means we can drop a patch as the AC_TRY_RUN has an
optimistic fallback for cross-compiling now.
(From OE-Core rev: 49ce9c09d86d645f3fa30e41430075b1ffa8c768)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch | 34 | ||||
-rw-r--r-- | meta/recipes-connectivity/kea/kea_1.7.10.bb (renamed from meta/recipes-connectivity/kea/kea_1.7.7.bb) | 4 |
2 files changed, 1 insertions, 37 deletions
diff --git a/meta/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch b/meta/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch deleted file mode 100644 index d7ca9ff8fa..0000000000 --- a/meta/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 9d6b8321c5b46199baca907f3d42bdcaaf1958a8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Thu, 23 May 2019 23:59:42 -0700 | ||
4 | Subject: [PATCH] remove AC_TRY_RUN | ||
5 | |||
6 | AC_TRY_RUN doesn't work in cross compile env, | ||
7 | use AC_COMPILE_IFELSE instead to fix below configure | ||
8 | error: | ||
9 | | checking for usuable C++11 regex... configure: error: in `/builddir/tmp/work/core2-64-poky-linux/kea/1.5.0-r0/build': | ||
10 | | configure: error: cannot run test program while cross compiling | ||
11 | |||
12 | Upstream-Status: Inappropriate [oe specific] | ||
13 | |||
14 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
15 | --- | ||
16 | configure.ac | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/configure.ac b/configure.ac | ||
20 | index c880b77..dd40c7c 100644 | ||
21 | --- a/configure.ac | ||
22 | +++ b/configure.ac | ||
23 | @@ -580,7 +580,7 @@ AC_TRY_COMPILE([ | ||
24 | AC_MSG_RESULT(no)) | ||
25 | |||
26 | AC_MSG_CHECKING(for usuable C++11 regex) | ||
27 | -AC_TRY_RUN([ | ||
28 | +AC_COMPILE_IFELSE([ | ||
29 | #include <regex> | ||
30 | #include <iostream> | ||
31 | int main() { | ||
32 | -- | ||
33 | 2.21.0 | ||
34 | |||
diff --git a/meta/recipes-connectivity/kea/kea_1.7.7.bb b/meta/recipes-connectivity/kea/kea_1.7.10.bb index d2e41e0db2..e2560b2399 100644 --- a/meta/recipes-connectivity/kea/kea_1.7.7.bb +++ b/meta/recipes-connectivity/kea/kea_1.7.10.bb | |||
@@ -9,13 +9,11 @@ DEPENDS = "boost log4cplus openssl" | |||
9 | 9 | ||
10 | SRC_URI = "\ | 10 | SRC_URI = "\ |
11 | http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ | 11 | http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ |
12 | file://0001-remove-AC_TRY_RUN.patch \ | ||
13 | file://kea-dhcp4.service \ | 12 | file://kea-dhcp4.service \ |
14 | file://kea-dhcp6.service \ | 13 | file://kea-dhcp6.service \ |
15 | file://kea-dhcp-ddns.service \ | 14 | file://kea-dhcp-ddns.service \ |
16 | " | 15 | " |
17 | SRC_URI[md5sum] = "4f8d1251fd41ef2e822a4eb3f0797d46" | 16 | SRC_URI[sha256sum] = "4e121f0e58b175a827581c69cb1d60778647049fa47f142940dddc9ce58f3c82" |
18 | SRC_URI[sha256sum] = "0bba8b045672884a928ff4b2a8575ac5ba420eb6ba47a9338f1932bc38dcf866" | ||
19 | 17 | ||
20 | inherit autotools systemd | 18 | inherit autotools systemd |
21 | 19 | ||