Răsfoiți Sursa

package/squid: add optional dependency to libxcrypt

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>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Bernd Kuhls 1 an în urmă
părinte
comite
330cb457fe
2 a modificat fișierele cu 5 adăugiri și 0 ștergeri
  1. 1 0
      package/squid/Config.in
  2. 4 0
      package/squid/squid.mk

+ 1 - 0
package/squid/Config.in

@@ -17,6 +17,7 @@ config BR2_PACKAGE_SQUID
 	depends on BR2_USE_MMU
 	depends on BR2_USE_MMU
 	select BR2_PACKAGE_LIBCAP
 	select BR2_PACKAGE_LIBCAP
 	select BR2_PACKAGE_LIBTOOL
 	select BR2_PACKAGE_LIBTOOL
+	select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBXML2
 	help
 	help
 	  Caching proxy for the Web supporting HTTP, HTTPS, FTP, and
 	  Caching proxy for the Web supporting HTTP, HTTPS, FTP, and

+ 4 - 0
package/squid/squid.mk

@@ -52,6 +52,10 @@ else
 SQUID_CONF_OPTS += --without-mit-krb5
 SQUID_CONF_OPTS += --without-mit-krb5
 endif
 endif
 
 
+ifeq ($(BR2_PACKAGE_LIBXCRYPT),y)
+SQUID_DEPENDENCIES += libxcrypt
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 SQUID_CONF_OPTS += --with-openssl
 SQUID_CONF_OPTS += --with-openssl
 SQUID_DEPENDENCIES += openssl
 SQUID_DEPENDENCIES += openssl