Message ID | 20240424212056.749427-1-romain.naour@smile.fr |
---|---|
State | Accepted |
Headers | show |
Series | package/llvm-project/compiler-rt: add libxcrypt dependency | expand |
Le 24/04/2024 à 23:20, Romain Naour a écrit : > When glibc was bumped to version 2.39 in commit > b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated > libcrypt support. > > But compiler-rt package still use crypt.h header and crypt() function > in the sanitizer code. > > Use libxcrypt unconditionally since compiler-rt itself already depends > on glibc based toolchain. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/6703222513 > > Signed-off-by: Romain Naour <romain.naour@smile.fr> > --- > package/llvm-project/compiler-rt/Config.in | 1 + > package/llvm-project/compiler-rt/compiler-rt.mk | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/llvm-project/compiler-rt/Config.in b/package/llvm-project/compiler-rt/Config.in > index e8f2ac4201..10f5d796b3 100644 > --- a/package/llvm-project/compiler-rt/Config.in > +++ b/package/llvm-project/compiler-rt/Config.in > @@ -3,6 +3,7 @@ config BR2_PACKAGE_COMPILER_RT > depends on BR2_PACKAGE_LLVM > depends on BR2_TOOLCHAIN_USES_GLIBC # asan lib requires > depends on BR2_HOST_GCC_AT_LEAST_7 # host-clang > + select BR2_PACKAGE_LIBXCRYPT > help > A collection of runtime libraries primarily used by clang and > llvm to provide builtins, sanitizer runtimes, and profiling > diff --git a/package/llvm-project/compiler-rt/compiler-rt.mk b/package/llvm-project/compiler-rt/compiler-rt.mk > index 5d9c3d8fa8..d4bc4d305b 100644 > --- a/package/llvm-project/compiler-rt/compiler-rt.mk > +++ b/package/llvm-project/compiler-rt/compiler-rt.mk > @@ -10,7 +10,7 @@ COMPILER_RT_SITE = $(LLVM_PROJECT_SITE) > COMPILER_RT_LICENSE = NCSA MIT > COMPILER_RT_LICENSE_FILES = LICENSE.TXT > COMPILER_RT_CPE_ID_VENDOR = llvm > -COMPILER_RT_DEPENDENCIES = host-clang llvm > +COMPILER_RT_DEPENDENCIES = host-clang libxcrypt llvm > COMPILER_RT_SUPPORTS_IN_SOURCE_BUILD = NO > > COMPILER_RT_INSTALL_STAGING = YES Applied to master, thanks. Best regards, Romain
diff --git a/package/llvm-project/compiler-rt/Config.in b/package/llvm-project/compiler-rt/Config.in index e8f2ac4201..10f5d796b3 100644 --- a/package/llvm-project/compiler-rt/Config.in +++ b/package/llvm-project/compiler-rt/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_COMPILER_RT depends on BR2_PACKAGE_LLVM depends on BR2_TOOLCHAIN_USES_GLIBC # asan lib requires depends on BR2_HOST_GCC_AT_LEAST_7 # host-clang + select BR2_PACKAGE_LIBXCRYPT help A collection of runtime libraries primarily used by clang and llvm to provide builtins, sanitizer runtimes, and profiling diff --git a/package/llvm-project/compiler-rt/compiler-rt.mk b/package/llvm-project/compiler-rt/compiler-rt.mk index 5d9c3d8fa8..d4bc4d305b 100644 --- a/package/llvm-project/compiler-rt/compiler-rt.mk +++ b/package/llvm-project/compiler-rt/compiler-rt.mk @@ -10,7 +10,7 @@ COMPILER_RT_SITE = $(LLVM_PROJECT_SITE) COMPILER_RT_LICENSE = NCSA MIT COMPILER_RT_LICENSE_FILES = LICENSE.TXT COMPILER_RT_CPE_ID_VENDOR = llvm -COMPILER_RT_DEPENDENCIES = host-clang llvm +COMPILER_RT_DEPENDENCIES = host-clang libxcrypt llvm COMPILER_RT_SUPPORTS_IN_SOURCE_BUILD = NO COMPILER_RT_INSTALL_STAGING = YES
When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. But compiler-rt package still use crypt.h header and crypt() function in the sanitizer code. Use libxcrypt unconditionally since compiler-rt itself already depends on glibc based toolchain. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6703222513 Signed-off-by: Romain Naour <romain.naour@smile.fr> --- package/llvm-project/compiler-rt/Config.in | 1 + package/llvm-project/compiler-rt/compiler-rt.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)