From 4922233cb0c8b0355acf8e96ac0eb59422405c17 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 Apr 2024 17:49:58 +0200 Subject: [PATCH] Revert "package/apache: add libxcrypt optional dependency" This reverts commit 02905fe54cb2136c15cc71d2840d60537f1513a8. The build error http://autobuild.buildroot.org/results/f0f55d9d66b07cb3408086d2632f8cd1bebb670e/ resulted from the apr package and was fixed with commit https://git.buildroot.net/buildroot/commit/?id=2402e0f1d31327806422692db6523120227bc5b0 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/apache/Config.in | 1 - package/apache/apache.mk | 4 ---- 2 files changed, 5 deletions(-) diff --git a/package/apache/Config.in b/package/apache/Config.in index bc3133ea00..270296bce4 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_APACHE depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR_UTIL select BR2_PACKAGE_PCRE2 - select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 619d13726e..1b095c5eb1 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -52,10 +52,6 @@ else APACHE_CONF_OPTS += --disable-brotli endif -ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) -APACHE_DEPENDENCIES += libxcrypt -endif - ifeq ($(BR2_PACKAGE_LIBXML2),y) APACHE_DEPENDENCIES += libxml2 # Apache wants the path to the header file, where it can find