From 2035d46d914ad8ec7226eec1d5ef8d55ab23a779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 5 Jan 2024 16:27:35 +0700
Subject: [PATCH] chroot.sh: split between glibc and musl path

---
 common/xbps-src/shutils/chroot.sh | 10 +++++++++-
 srcpkgs/libxcrypt/template        |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 4d0426802ef..fc17dae4fdb 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -14,7 +14,15 @@ install_base_chroot() {
         _bootstrap_arch="env XBPS_TARGET_ARCH=$XBPS_TARGET_PKG"
     fi
     (export XBPS_MACHINE=$XBPS_TARGET_PKG XBPS_ARCH=$XBPS_TARGET_PKG; chroot_sync_repodata)
-    ${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS} -y base-chroot glibc libxcrypt-compat
+    # 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 glibc libxcrypt-compat
+            ;;
+    esac
     if [ $? -ne 0 ]; then
         msg_error "xbps-src: failed to install base-chroot!\n"
     fi
diff --git a/srcpkgs/libxcrypt/template b/srcpkgs/libxcrypt/template
index 228d758e161..0495974c2ca 100644
--- a/srcpkgs/libxcrypt/template
+++ b/srcpkgs/libxcrypt/template
@@ -43,7 +43,6 @@ post_check() {
 
 pre_install() {
 	make -C compat-build DESTDIR=${DESTDIR} install
-
 	# Don't install development files from the compat library
 	rm -r ${DESTDIR}/usr/{include,lib/{lib*.so,pkgconfig},share}
 }