3 files changed, 8 insertions, 2 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 7ff878a5d..e14770572 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -146,6 +146,12 @@ package() {
   for carch in "${arch[@]}"; do
     install -m644 "$srcdir/pacman.conf.$carch" "$pkgdir/usr/share/pacman/defaults/"
     install -m644 "$srcdir/makepkg.conf.$carch" "$pkgdir/usr/share/pacman/defaults/"
+
+    # fix defaults 'Architecture' to one arch (allows pacstrap to create cross-arch chroots)
+    local pacman_conf="$pkgdir/usr/share/pacman/defaults/pacman.conf.$carch"
+    local err_msg="could not apply 'Architecture' patch to ${pacman_conf}"
+    sed -i 's|^Architecture = .*|Architecture = auto|' "${pacman_conf}"
+    grep -E '^Architecture = auto$' "${pacman_conf}" || ! echo "${err_msg}"
   done
 
   # Parabola's pacman began shipping a weekly job for this back in
diff --git a/libre/pacman/pacman.conf.i686 b/libre/pacman/pacman.conf.i686
index 46c0dc077..bf9a8f6da 100644
--- a/libre/pacman/pacman.conf.i686
+++ b/libre/pacman/pacman.conf.i686
@@ -19,7 +19,7 @@ HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
-Architecture = i686
+Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =
diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64
index 9ac6985ff..035d88bf6 100644
--- a/libre/pacman/pacman.conf.x86_64
+++ b/libre/pacman/pacman.conf.x86_64
@@ -19,7 +19,7 @@ HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
-Architecture = x86_64
+Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =