tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chroot.sh: split between glibc and musl path

Browse Source
This commit is contained in:
Đoàn Trần Công Danh 2024-01-05 16:27:35 +07:00
parent 9fe1dba9c7
commit 2035d46d91
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/xbps-src/shutils/chroot.sh
View File

@ -14,7 +14,15 @@ 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)
${_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 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

1
srcpkgs/libxcrypt/template
View File

@ -43,7 +43,6 @@ post_check() {
pre_install() { pre_install() {
make -C compat-build DESTDIR=${DESTDIR} install make -C compat-build DESTDIR=${DESTDIR} install
# Don't install development files from the compat library # Don't install development files from the compat library
rm -r ${DESTDIR}/usr/{include,lib/{lib*.so,pkgconfig},share} rm -r ${DESTDIR}/usr/{include,lib/{lib*.so,pkgconfig},share}
} }