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