From c7a1ee8f10728fcaab1ab85e93b584d4f3109354 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 11:22:47 +0200 Subject: [PATCH] package/android-tools: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-7/output-1/host/lib/gcc/aarch64_be-buildroot-linux-gnu/12.3.0/../../../../aarch64_be-buildroot-linux-gnu/bin/ld: cannot find -lcrypt: No such file or directory Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/ab7c1ff0649bec21584654431e722efe2dc88c3d Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: coding style] Signed-off-by: Yann E. MORIN --- package/android-tools/Config.in | 1 + package/android-tools/android-tools.mk | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/android-tools/Config.in b/package/android-tools/Config.in index bc76d545c1..a688182ed9 100644 --- a/package/android-tools/Config.in +++ b/package/android-tools/Config.in @@ -68,6 +68,7 @@ config BR2_PACKAGE_ANDROID_TOOLS_ADB config BR2_PACKAGE_ANDROID_TOOLS_ADBD bool "adbd" depends on BR2_USE_MMU # uses fork() + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB help diff --git a/package/android-tools/android-tools.mk b/package/android-tools/android-tools.mk index 3d5c76a322..20e26839f9 100644 --- a/package/android-tools/android-tools.mk +++ b/package/android-tools/android-tools.mk @@ -63,7 +63,10 @@ endif ifeq ($(BR2_PACKAGE_ANDROID_TOOLS_ADBD),y) ANDROID_TOOLS_TARGETS += adbd -ANDROID_TOOLS_DEPENDENCIES += zlib openssl +ANDROID_TOOLS_DEPENDENCIES += \ + openssl \ + zlib \ + $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) endif # Build each tool in its own directory not to share object files