| Message ID | YqGyLxqxwd94KHVS@waldemar-brodkorb.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/openswan: allow uClibc build | expand |
On Thu, 9 Jun 2022 10:41:19 +0200 Waldemar Brodkorb <wbx@openadk.org> wrote: > uClibc-ng 1.0.41 added ns_t_tkey > > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> > --- > package/openswan/Config.in | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Thanks a lot for this patch! As usual, we will need to hold off a little bit on this one, until Bootlin external toolchains get rebuilt with uClibc-ng 1.0.41, otherwise we will get tons of build failures in our autobuilders. Thomas
On Thu, 9 Jun 2022 10:41:19 +0200 Waldemar Brodkorb <wbx@openadk.org> wrote: > uClibc-ng 1.0.41 added ns_t_tkey > > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> > --- > package/openswan/Config.in | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Since it was annoying to wait for uClibc-ng 1.0.41 to be deployed in all toolchains, I have applied your change + a work-around patch on the Openswan source code that removes the need for ns_t_tkey, by using directly an hardcoded value. Not nice, but it works and we can drop this workaround in the future. Thanks! Thomas
diff --git a/package/openswan/Config.in b/package/openswan/Config.in index c71d064daf..724654e984 100644 --- a/package/openswan/Config.in +++ b/package/openswan/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_OPENSWAN bool "openswan" depends on BR2_USE_MMU # iproute2 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2 - depends on !BR2_TOOLCHAIN_USES_UCLIBC # ns_t_tkey select BR2_PACKAGE_GMP select BR2_PACKAGE_IPROUTE2 help @@ -10,7 +9,6 @@ config BR2_PACKAGE_OPENSWAN http://www.openswan.org -comment "openswan needs a glibc or musl toolchain w/ headers >= 3.4" +comment "openswan needs a toolchain w/ headers >= 3.4" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || \ - BR2_TOOLCHAIN_USES_UCLIBC + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
uClibc-ng 1.0.41 added ns_t_tkey Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> --- package/openswan/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)