[Buildroot] [git commit] package/cryptsetup: argp is needed for SSH plugin

[Thomas Petazzoni]

commit: https://git.buildroot.net/buildroot/commit/?id=1b4e5f4c57f71e0b0677792818cd6fb526e65493
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

argp is needed for SSH plugin to avoid the following build failure
raised since bump to version 2.4.2 in commit
b537fe14339592023221a7c200257eb3a923c0be:

configure: error: You need argp library.

Fixes:
 - http://autobuild.buildroot.org/results/6740792920a28c91f4f82a8f8c2fb525ed80410a

Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
 package/cryptsetup/Config.in     | 2 ++
 package/cryptsetup/cryptsetup.mk | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in
index d9c9d4d4f4..f36883ea47 100644
--- a/package/cryptsetup/Config.in
+++ b/package/cryptsetup/Config.in
@@ -4,6 +4,8 @@ config BR2_PACKAGE_CRYPTSETUP
 	depends on BR2_USE_MMU # lvm2, libargon2
 	depends on !BR2_STATIC_LIBS # lvm2, libargon2
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
+	select BR2_PACKAGE_ARGP_STANDALONE if BR2_PACKAGE_LIBSSH && \
+		(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL)
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_LVM2
 	select BR2_PACKAGE_UTIL_LINUX
diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk
index 980a36faa8..676cd25be4 100644
--- a/package/cryptsetup/cryptsetup.mk
+++ b/package/cryptsetup/cryptsetup.mk
@@ -34,7 +34,9 @@ CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel
 endif
 
 ifeq ($(BR2_PACKAGE_LIBSSH),y)
-CRYPTSETUP_DEPENDENCIES += libssh
+CRYPTSETUP_DEPENDENCIES += \
+	$(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone) \
+	libssh
 CRYPTSETUP_CONF_OPTS += --enable-ssh-token
 else
 CRYPTSETUP_CONF_OPTS += --disable-ssh-token