All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bernd Kuhls <bernd@kuhls.net>
To: buildroot@buildroot.org
Subject: [Buildroot] [PATCH 8/9] package/squid: add optional dependency to libxcrypt
Date: Wed,  3 Apr 2024 17:36:40 +0200	[thread overview]
Message-ID: <20240403153641.4122789-8-bernd@kuhls.net> (raw)
In-Reply-To: <20240403153641.4122789-1-bernd@kuhls.net>

When glibc was bumped to version 2.39 in commit
b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated
libcrypt support.

As glibc's libcrypt was providing squid's libcrypt dependency this
broke the squid build using glibc version 2.39.

To fix this select the libxcrypt dependency to squid when using a
glibc toolchain and add the dependency if selected.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/squid/Config.in | 1 +
 package/squid/squid.mk  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/package/squid/Config.in b/package/squid/Config.in
index 149884d815..ab13e735e1 100644
--- a/package/squid/Config.in
+++ b/package/squid/Config.in
@@ -17,6 +17,7 @@ config BR2_PACKAGE_SQUID
 	depends on BR2_USE_MMU
 	select BR2_PACKAGE_LIBCAP
 	select BR2_PACKAGE_LIBTOOL
+	select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC
 	select BR2_PACKAGE_LIBXML2
 	help
 	  Caching proxy for the Web supporting HTTP, HTTPS, FTP, and
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 6a2b522336..e325c63cb0 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -52,6 +52,10 @@ else
 SQUID_CONF_OPTS += --without-mit-krb5
 endif
 
+ifeq ($(BR2_PACKAGE_LIBXCRYPT),y)
+SQUID_DEPENDENCIES += libxcrypt
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 SQUID_CONF_OPTS += --with-openssl
 SQUID_DEPENDENCIES += openssl
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

  parent reply	other threads:[~2024-04-03 15:37 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-03 15:36 [Buildroot] [PATCH 1/9] package/apg: add optional dependency to libxcrypt Bernd Kuhls
2024-04-03 15:36 ` [Buildroot] [PATCH 2/9] package/apr: " Bernd Kuhls
2024-04-03 15:36 ` [Buildroot] [PATCH 3/9] package/dovecot: " Bernd Kuhls
2024-04-03 15:36 ` [Buildroot] [PATCH 4/9] package/freeswitch: " Bernd Kuhls
2024-04-03 15:36 ` [Buildroot] [PATCH 5/9] package/leafnode2: " Bernd Kuhls
2024-04-03 15:36 ` [Buildroot] [PATCH 6/9] package/lighttpd: " Bernd Kuhls
2024-04-03 15:36 ` [Buildroot] [PATCH 7/9] package/pure-ftpd: " Bernd Kuhls
2024-04-03 15:36 ` Bernd Kuhls [this message]
2024-04-03 15:36 ` [Buildroot] [PATCH 9/9] package/sysvinit: " Bernd Kuhls
2024-04-03 19:56 ` [Buildroot] [PATCH 1/9] package/apg: " Yann E. MORIN

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240403153641.4122789-8-bernd@kuhls.net \
    --to=bernd@kuhls.net \
    --cc=buildroot@buildroot.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.