From 5285cb92120cd1caa8b5361c9261a47275513f7d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 4 Jan 2020 08:59:10 +0100
Subject: [PATCH] xbps-src: fix for x86_64 local multilib repos.

Found and fixed by @pullmoll
---
 common/xbps-src/shutils/chroot.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index b463278c29..744b99a8a0 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -226,7 +226,15 @@ chroot_sync_repodata() {
     sed -e "s,/host,$hostdir,g" ${XBPS_DISTDIR}/etc/xbps.d/repos-local.conf \
         > $confdir/10-repository-local.conf
 
-    if [ -z "$XBPS_SKIP_REMOTEREPOS" ]; then
+    if [ "$XBPS_SKIP_REMOTEREPOS" ]; then
+        case "$XBPS_MACHINE" in
+            x86_64)
+            # x86_64/glibc
+            install -Dm644 ${XBPS_DISTDIR}/etc/xbps.d/repos-local-x86_64.conf \
+                $confdir/12-repository-local-x86_64.conf
+            ;;
+        esac
+    else
         case "$XBPS_MACHINE" in
             *-musl)
                 install -Dm644 ${XBPS_DISTDIR}/etc/xbps.d/repos-remote-musl.conf \