Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/cryptsetup: argp is needed for SSH plugin
@ 2021-12-30  9:13 Fabrice Fontaine
  2021-12-30 12:27 ` Thomas Petazzoni
  0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2021-12-30  9:13 UTC (permalink / raw)
  To: buildroot; +Cc: Martin Hicks, Fabrice Fontaine

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@gmail.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
-- 
2.33.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-12-30 12:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-30  9:13 [Buildroot] [PATCH 1/1] package/cryptsetup: argp is needed for SSH plugin Fabrice Fontaine
2021-12-30 12:27 ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox