Browse Source

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 <fontaine.fabrice@gmail.com>
[yann.morin.1998@free.fr: coding style]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Fabrice Fontaine 1 year ago
parent
commit
c7a1ee8f10
2 changed files with 5 additions and 1 deletions
  1. 1 0
      package/android-tools/Config.in
  2. 4 1
      package/android-tools/android-tools.mk

+ 1 - 0
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

+ 4 - 1
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