[Buildroot] [PATCH 1/1] package/android-tools: add libxcrypt optional dependency
Yann E. MORIN
yann.morin.1998 at free.fr
Sun Apr 7 12:18:45 UTC 2024
Fabrice, All,
On 2024-04-07 11:22 +0200, Fabrice Fontaine spake thusly:
> 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 at gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/android-tools/Config.in | 1 +
> package/android-tools/android-tools.mk | 4 +++-
> 2 files changed, 4 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..f273ea5cdf 100644
> --- a/package/android-tools/android-tools.mk
> +++ b/package/android-tools/android-tools.mk
> @@ -63,7 +63,9 @@ endif
>
> ifeq ($(BR2_PACKAGE_ANDROID_TOOLS_ADBD),y)
> ANDROID_TOOLS_TARGETS += adbd
> -ANDROID_TOOLS_DEPENDENCIES += zlib openssl
> +ANDROID_TOOLS_DEPENDENCIES += \
> + $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \
> + zlib openssl
> endif
>
> # Build each tool in its own directory not to share object files
> --
> 2.43.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list