diff mbox series

[1/1] package/openswan: select libxcrypt if needed

Message ID 20240720193142.770839-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/1] package/openswan: select libxcrypt if needed | expand

Commit Message

Fabrice Fontaine July 20, 2024, 7:31 p.m. UTC
Fix the following build failure raised since bump of glibc to version
2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97:

/home/autobuild/autobuild/instance-7/output-1/build/openswan-3.0.0/programs/pluto/xauth.c:36:10: fatal error: crypt.h: No such file or directory
   36 | #include <crypt.h>
      |          ^~~~~~~~~

Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97
 - http://autobuild.buildroot.org/results/df7cce809e3e4aa92e700a3fc5105c6c20f21f6b

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/openswan/Config.in   | 1 +
 package/openswan/openswan.mk | 4 ++++
 2 files changed, 5 insertions(+)

Comments

Thomas Petazzoni July 20, 2024, 9:05 p.m. UTC | #1
On Sat, 20 Jul 2024 21:31:42 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Fix the following build failure raised since bump of glibc to version
> 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97:
> 
> /home/autobuild/autobuild/instance-7/output-1/build/openswan-3.0.0/programs/pluto/xauth.c:36:10: fatal error: crypt.h: No such file or directory
>    36 | #include <crypt.h>
>       |          ^~~~~~~~~
> 
> Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97
>  - http://autobuild.buildroot.org/results/df7cce809e3e4aa92e700a3fc5105c6c20f21f6b
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/openswan/Config.in   | 1 +
>  package/openswan/openswan.mk | 4 ++++
>  2 files changed, 5 insertions(+)

Applied to master, thanks.

Thomas
Peter Korsgaard Aug. 29, 2024, 6:16 a.m. UTC | #2
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Fix the following build failure raised since bump of glibc to version
 > 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97:

 > /home/autobuild/autobuild/instance-7/output-1/build/openswan-3.0.0/programs/pluto/xauth.c:36:10: fatal error: crypt.h: No such file or directory
 >    36 | #include <crypt.h>
 >       |          ^~~~~~~~~

 > Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97
 >  - http://autobuild.buildroot.org/results/df7cce809e3e4aa92e700a3fc5105c6c20f21f6b

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2024.05.x, thanks.
diff mbox series

Patch

diff --git a/package/openswan/Config.in b/package/openswan/Config.in
index 724654e984..31c4a66b35 100644
--- a/package/openswan/Config.in
+++ b/package/openswan/Config.in
@@ -4,6 +4,7 @@  config BR2_PACKAGE_OPENSWAN
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2
 	select BR2_PACKAGE_GMP
 	select BR2_PACKAGE_IPROUTE2
+	select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  Openswan is an implementation of IPsec for Linux
 
diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk
index 4c6a779f0d..64218810f8 100644
--- a/package/openswan/openswan.mk
+++ b/package/openswan/openswan.mk
@@ -22,6 +22,10 @@  OPENSWAN_DEPENDENCIES += libcurl
 OPENSWAN_MAKE_OPTS += USE_LIBCURL=true
 endif
 
+ifeq ($(BR2_PACKAGE_LIBXCRYPT),y)
+OPENSWAN_DEPENDENCIES += libxcrypt
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 OPENSWAN_DEPENDENCIES += openssl
 OPENSWAN_MAKE_OPTS += HAVE_OPENSSL=true