From 08ea9236a81b731356933da20d9fe8543376449c Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 17 Mar 2024 22:58:22 -0700 Subject: [PATCH] glibc: re-add depends on libxcrypt-compat Partially reverts 3269bbc3a88dea9e217147036983271163a09014 This was removed as one cause was related to having an old glibc-32bit installed. However the missing shlibs errors also get ignored when updating xbps (and not otherwise). --- srcpkgs/glibc/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 877e2c9fec2..830cfdd26eb 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -1,7 +1,7 @@ # Template file for 'glibc' pkgname=glibc version=2.39 -revision=1 +revision=2 bootstrap=yes short_desc="GNU C library" maintainer="Enno Boland " @@ -48,12 +48,13 @@ conf_files=" /etc/ld.so.conf" if [ "$CHROOT_READY" ]; then hostmakedepends="bison gettext perl python3 texinfo" + # XXX: remove this on the next update + # ensures partial upgrades don't break things like PAM + depends="libxcrypt-compat" fi makedepends="kernel-libc-headers" lib32files="/usr/lib/gconv/gconv-modules" lib32symlinks="ld-linux.so.2" -# glibc 2.38 stops providing libcrypt.so.1 -conflicts="glibc-32bit<2.38_1" archs="~*-musl" if [ "$XBPS_TARGET_LIBC" = musl ]; then broken="no point in building this for musl"