| Message ID | 20240407154958.4107385-1-bernd@kuhls.net |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] Revert "package/apache: add libxcrypt optional dependency" | expand |
Bernd, all, On 2024-04-07 17:49 +0200, Bernd Kuhls spake thusly: > 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 Indeed, I did a test build with this patch applied, and threre is indeed no failure. Thanks for noticing! > Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Applied to master, thanks. Regards, 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 > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
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
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 <bernd@kuhls.net> --- package/apache/Config.in | 1 - package/apache/apache.mk | 4 ---- 2 files changed, 5 deletions(-)