diff options
Diffstat (limited to 'external/meta-openembedded/meta-networking/recipes-connectivity/kea/files')
5 files changed, 36 insertions, 122 deletions
diff --git a/external/meta-openembedded/meta-networking/recipes-connectivity/kea/files/0001-Fix-error-call-of-overloaded-distance-is-ambiguous.patch b/external/meta-openembedded/meta-networking/recipes-connectivity/kea/files/0001-Fix-error-call-of-overloaded-distance-is-ambiguous.patch deleted file mode 100644 index fb16ecbf..00000000 --- a/external/meta-openembedded/meta-networking/recipes-connectivity/kea/files/0001-Fix-error-call-of-overloaded-distance-is-ambiguous.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 8ea2ee451a1af7c5b5c8f4b36c1f77d44442064d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 7 Sep 2018 13:02:35 -0700 -Subject: [PATCH] Fix error: call of overloaded distance is ambiguous -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The boost::iterators::distance function template is an adapted version -of std::distance for the Boost iterator traversal in 2.68 it has started -to fail with argument dependent lookup and compiler is erroring out - -with - -error: call of overloaded ‘distance' - -boost implementation of distance is protected against being found by ADL - -The way function is called in libdhcp means it will be found via ADL and -all namespaces will be considered which is providing problematic since -its getting it from both std:: and boost:: namespaces - -so let it not rely on ADL by qualifying then calls with std:: namespace - -Upstream-Status: Submitted [https://github.com/isc-projects/kea/pull/103] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/lib/dhcp/libdhcp++.cc | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/lib/dhcp/libdhcp++.cc b/src/lib/dhcp/libdhcp++.cc -index 330c02b..ced705d 100644 ---- a/src/lib/dhcp/libdhcp++.cc -+++ b/src/lib/dhcp/libdhcp++.cc -@@ -419,14 +419,14 @@ size_t LibDHCP::unpackOptions6(const OptionBuffer& buf, - // We previously did the lookup only for dhcp6 option space, but with the - // addition of S46 options, we now do it for every space. - range = idx.equal_range(opt_type); -- num_defs = distance(range.first, range.second); -+ num_defs = std::distance(range.first, range.second); - - // Standard option definitions do not include the definition for - // our option or we're searching for non-standard option. Try to - // find the definition among runtime option definitions. - if (num_defs == 0) { - range = runtime_idx.equal_range(opt_type); -- num_defs = distance(range.first, range.second); -+ num_defs = std::distance(range.first, range.second); - } - - OptionPtr opt; -@@ -538,14 +538,14 @@ size_t LibDHCP::unpackOptions4(const OptionBuffer& buf, - // may be standard options in other spaces (e.g. radius). So we now do - // the lookup for every space. - range = idx.equal_range(opt_type); -- num_defs = distance(range.first, range.second); -+ num_defs = std::distance(range.first, range.second); - - // Standard option definitions do not include the definition for - // our option or we're searching for non-standard option. Try to - // find the definition among runtime option definitions. - if (num_defs == 0) { - range = runtime_idx.equal_range(opt_type); -- num_defs = distance(range.first, range.second); -+ num_defs = std::distance(range.first, range.second); - } - - // Check if option unpacking must be deferred -@@ -638,7 +638,7 @@ size_t LibDHCP::unpackVendorOptions6(const uint32_t vendor_id, - idx->equal_range(opt_type); - // Get the number of returned option definitions for the - // option code. -- size_t num_defs = distance(range.first, range.second); -+ size_t num_defs = std::distance(range.first, range.second); - - if (num_defs > 1) { - // Multiple options of the same code are not supported -@@ -746,7 +746,7 @@ size_t LibDHCP::unpackVendorOptions4(const uint32_t vendor_id, const OptionBuffe - idx->equal_range(opt_type); - // Get the number of returned option definitions for - // the option code. -- size_t num_defs = distance(range.first, range.second); -+ size_t num_defs = std::distance(range.first, range.second); - - if (num_defs > 1) { - // Multiple options of the same code are not --- -2.18.0 - diff --git a/external/meta-openembedded/meta-networking/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch b/external/meta-openembedded/meta-networking/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch new file mode 100644 index 00000000..d7ca9ff8 --- /dev/null +++ b/external/meta-openembedded/meta-networking/recipes-connectivity/kea/files/0001-remove-AC_TRY_RUN.patch @@ -0,0 +1,34 @@ +From 9d6b8321c5b46199baca907f3d42bdcaaf1958a8 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 23 May 2019 23:59:42 -0700 +Subject: [PATCH] remove AC_TRY_RUN + +AC_TRY_RUN doesn't work in cross compile env, +use AC_COMPILE_IFELSE instead to fix below configure +error: + | checking for usuable C++11 regex... configure: error: in `/builddir/tmp/work/core2-64-poky-linux/kea/1.5.0-r0/build': + | configure: error: cannot run test program while cross compiling + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c880b77..dd40c7c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -580,7 +580,7 @@ AC_TRY_COMPILE([ + AC_MSG_RESULT(no)) + + AC_MSG_CHECKING(for usuable C++11 regex) +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([ + #include <regex> + #include <iostream> + int main() { +-- +2.21.0 + diff --git a/external/meta-openembedded/meta-networking/recipes-connectivity/kea/files/0003-Makefile.am-update-hooksdir-for-lease_cmds.patch b/external/meta-openembedded/meta-networking/recipes-connectivity/kea/files/0003-Makefile.am-update-hooksdir-for-lease_cmds.patch deleted file mode 100644 index 381a3a7e..00000000 --- a/external/meta-openembedded/meta-networking/recipes-connectivity/kea/files/0003-Makefile.am-update-hooksdir-for-lease_cmds.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cd902b8b588681a27d5321f1ee078a1c8f6e6935 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <Mingli.Yu@windriver.com> -Date: Wed, 21 Mar 2018 06:01:38 +0000 -Subject: [PATCH 3/3] Makefile.am: update hooksdir for lease_cmds - -update hooksdir for lease_cmds - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> - ---- - src/hooks/dhcp/lease_cmds/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hooks/dhcp/lease_cmds/Makefile.am b/src/hooks/dhcp/lease_cmds/Makefile.am -index cfd6779..22cc4a9 100644 ---- a/src/hooks/dhcp/lease_cmds/Makefile.am -+++ b/src/hooks/dhcp/lease_cmds/Makefile.am -@@ -37,7 +37,7 @@ liblease_cmds_la_CXXFLAGS = $(AM_CXXFLAGS) - liblease_cmds_la_CPPFLAGS = $(AM_CPPFLAGS) - - # install the shared object into $(libdir)/hooks --lib_hooksdir = $(libdir)/hooks -+lib_hooksdir = $(libdir)/kea/hooks - lib_hooks_LTLIBRARIES = libdhcp_lease_cmds.la - - libdhcp_lease_cmds_la_SOURCES = --- -2.18.0 - diff --git a/external/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service b/external/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service index f32edcb9..b851ea71 100644 --- a/external/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service +++ b/external/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service @@ -6,7 +6,7 @@ After=time-sync.target [Service] ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/ -ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/kea +ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea ExecStart=@SBINDIR@/kea-dhcp4 -c @SYSCONFDIR@/kea/kea-dhcp4.conf [Install] diff --git a/external/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service b/external/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service index 26d2205e..0f9f0ef8 100644 --- a/external/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service +++ b/external/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service @@ -6,7 +6,7 @@ After=time-sync.target [Service] ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/ -ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/kea +ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea ExecStart=@SBINDIR@/kea-dhcp6 -c @SYSCONFDIR@/kea/kea-dhcp6.conf [Install] |