moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

Revert "chroot.sh: force install glibc and libxcrypt-compat to rebuild"

Browse source 
This reverts 9fe1dba9c7

The issue was resolved in e255843fd1
This commit is contained in:
oreo639 2024-03-13 19:42:24 -07:00
parent d52e080941
commit df7a75346e
1 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/xbps-src/shutils/chroot.sh
View file

@ -14,15 +14,7 @@ install_base_chroot() {
_bootstrap_arch="env XBPS_TARGET_ARCH=$XBPS_TARGET_PKG" _bootstrap_arch="env XBPS_TARGET_ARCH=$XBPS_TARGET_PKG"
fi fi
(export XBPS_MACHINE=$XBPS_TARGET_PKG XBPS_ARCH=$XBPS_TARGET_PKG; chroot_sync_repodata) (export XBPS_MACHINE=$XBPS_TARGET_PKG XBPS_ARCH=$XBPS_TARGET_PKG; chroot_sync_repodata)
# Fix cyclic between glibc and libxcrypt-compat
case "$XBPS_MACHINE" in
*-musl)
${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS} -y base-chroot ${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS} -y base-chroot
;;
*)
${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS} -y base-chroot glibc libxcrypt-compat
;;
esac
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
msg_error "xbps-src: failed to install base-chroot!\n" msg_error "xbps-src: failed to install base-chroot!\n"
fi fi