From 3da6dca137595767e2d8fa6cd8d6d4b10a49b5c2 Mon Sep 17 00:00:00 2001
From: nyyu <mail@nyyu.dev>
Date: Wed, 27 Dec 2023 13:20:11 +0100
Subject: [PATCH] chore(conf): sync with devtools [CI SKIP]

---
 conf/makepkg.conf                 | 9 +++++----
 conf/pacman-conf.d-noextract.conf | 1 +
 conf/pacman.conf                  | 7 ++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/conf/makepkg.conf b/conf/makepkg.conf
index 3324cec..026ce90 100644
--- a/conf/makepkg.conf
+++ b/conf/makepkg.conf
@@ -25,7 +25,7 @@ DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
 
 #-- The package required by makepkg to download VCS sources
 #  Format: 'protocol::package'
-VCSCLIENTS=('bzr::bzr'
+VCSCLIENTS=('bzr::breezy'
             'fossil::fossil'
             'git::git'
             'hg::mercurial'
@@ -44,15 +44,16 @@ CFLAGS="-march=x86-64-v2 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
         -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
         -fstack-clash-protection -fcf-protection"
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now,-z,pack-relative-relocs"
+LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
+         -Wl,-z,pack-relative-relocs"
 LTOFLAGS="-flto=auto"
-#RUSTFLAGS="-C opt-level=2"
+RUSTFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems
 MAKEFLAGS="-j8"
 #-- Debugging flags
 DEBUG_CFLAGS="-g"
 DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
-#DEBUG_RUSTFLAGS="-C debuginfo=2"
+DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT
diff --git a/conf/pacman-conf.d-noextract.conf b/conf/pacman-conf.d-noextract.conf
index c243ad9..d3af1c2 100644
--- a/conf/pacman-conf.d-noextract.conf
+++ b/conf/pacman-conf.d-noextract.conf
@@ -10,3 +10,4 @@ NoExtract = !usr/share/X11/locale/compose.dir !usr/share/X11/locale/iso8859-1/*
 NoExtract = !usr/share/*locales/C !usr/share/*locales/POSIX !usr/share/i18n/charmaps/ANSI_X3.4-1968.gz
 NoExtract = usr/share/man/* usr/share/info/*
 NoExtract = usr/share/vim/vim*/lang/*
+NoExtract = etc/pacman.conf etc/pacman.d/mirrorlist
diff --git a/conf/pacman.conf b/conf/pacman.conf
index b2ce0d6..75619b7 100644
--- a/conf/pacman.conf
+++ b/conf/pacman.conf
@@ -30,9 +30,10 @@ Architecture = auto
 
 # Misc options
 #UseSyslog
-Color
-#NoProgressBar
-CheckSpace
+#Color
+NoProgressBar
+# We cannot check disk space from within a chroot environment
+#CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5