From c9dede4e237bdabe8ae9777ccc68a67dc557e8ad Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sat, 12 Dec 2015 07:35:30 +0100
Subject: [PATCH] xbps-src: force glibc locale generation on musl hosts.

localedef is only available with glibc, so that defer locale creation
once the chroot is ready.

This fixes installing bootstrap glibc pkgs on musl hosts.
---
 common/xbps-src/shutils/chroot.sh | 1 -
 xbps-src                          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index fa8d259bd3b..aa22d9fe361 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -98,7 +98,6 @@ chroot_prepare() {
     # Prepare default locale: en_US.UTF-8.
     if [ -z "$XBPS_TEMP_MASTERDIR" -a -s ${XBPS_MASTERDIR}/etc/default/libc-locales ]; then
         echo 'en_US.UTF-8 UTF-8' >> ${XBPS_MASTERDIR}/etc/default/libc-locales
-        $XBPS_RECONFIGURE_CMD -f glibc-locales
     fi
 
     touch -f $XBPS_MASTERDIR/.xbps_chroot_init
diff --git a/xbps-src b/xbps-src
index 27becac9c95..c273448a453 100755
--- a/xbps-src
+++ b/xbps-src
@@ -303,7 +303,7 @@ install_bbootstrap() {
 
 reconfigure_bootstrap_pkgs() {
     local statefile="$XBPS_MASTERDIR/.xbps_chroot_configured"
-    local pkgs="ca-certificates"
+    local pkgs="glibc-locales ca-certificates"
     [ -z "$IN_CHROOT" -o -e $statefile ] && return 0
     # Reconfigure ca-certificates.
     msg_normal "Reconfiguring bootstrap packages...\n"