From e255843fd168248697e10b30729fb3c6393f3aa8 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 4 Jan 2024 12:57:33 -0500 Subject: [PATCH] libxcrypt: noverifyrdeps on libxcrypt-compat this fixes the dependency cycle when installing e.g. `base-system` on an empty root: ``` $ mkdir /tmp/testroot $ xbps-install -SdR https://repo-default.voidlinux.org/current -r /tmp/testroot base-system ... [DEBUG] Error checking glibc>=2.36_1 for rundeps: Too many levels of symbolic links [DEBUG] Error checking libxcrypt-compat>=0 for rundeps: Too many levels of symbolic links ... ``` After this change, there should be no special user intervention needed or error to resolve. --- srcpkgs/libxcrypt/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libxcrypt/template b/srcpkgs/libxcrypt/template index 3e8ecdbe40e..228d758e161 100644 --- a/srcpkgs/libxcrypt/template +++ b/srcpkgs/libxcrypt/template @@ -1,10 +1,11 @@ # Template file for 'libxcrypt' pkgname=libxcrypt version=4.4.36 -revision=2 +revision=3 archs="~*-musl" build_style=gnu-configure configure_args="--enable-hashes=all --disable-failure-tokens --enable-obsolete-api=no" +make_cmd="make -C build" hostmakedepends="perl-bootstrap" checkdepends="python3-passlib" short_desc="Modern library for one-way hashing of passwords" @@ -13,7 +14,6 @@ license="LGPL-2.1-or-later, BSD-3-Clause, BSD-2-Clause, 0BSD, Public Domain" homepage="https://github.com/besser82/libxcrypt" distfiles="https://github.com/besser82/libxcrypt/releases/download/v${version}/libxcrypt-${version}.tar.xz" checksum=e5e1f4caee0a01de2aee26e3138807d6d3ca2b8e67287966d1fefd65e1fd8943 -make_cmd="make -C build" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then broken="musl already provides libcrypt" @@ -66,6 +66,7 @@ libxcrypt-devel_package() { libxcrypt-compat_package() { short_desc+=" - legacy compatibility" + noverifyrdeps=yes pkg_install() { vmove usr/lib/libcrypt.so.1* }