From 3174c044090f6011aab81ba2fd4b10912469ebbf Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Tue, 14 Jul 2020 11:29:46 +0200
Subject: core/pacman: makepkg.conf updated from upstream

---
 core/pacman/PKGBUILD     | 6 +++---
 core/pacman/makepkg.conf | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'core')

diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index 7de432f7..ca56ff47 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -1,11 +1,11 @@
-# upstream git revision: 6a11428ac69b84060dc0b80bad752bd008e0b6d3
+# upstream git revision: 18811ca7ee347721a700db2080a50df06a0a79fc
 
 depends+=(archlinux32-keyring)
 
 # fail if upstream changes makepkg.conf or pacman.conf
 for ((i=0; i<${#sha256sums[@]}; i++)); do
-  if [ "${sha256sums[${i}]}" = '8c100b64450f5a19a16325dd05c143d49395bdeb96bd957f863cde4b95d3cb86' ]; then
-    sha256sums[${i}]='3c65dbd2518c9522d1a65d83b49dbebf5fac1a5488d73b62e10b423aee27dc8c'
+  if [ "${sha256sums[${i}]}" = '9c769f13c09a6f24c393a9762474eded2f269d8966e7764d9160d62232a7919b' ]; then
+    sha256sums[${i}]='b2967ed2b41ac2841b4a367e1f39d698293fe69e95f180486436b5a10b375865'
   fi
   if [ "${sha256sums[${i}]}" = '3353f363088c73f1f86a890547c0f87c7473e5caf43bbbc768c2e9a7397f2aa2' ]; then
     sha256sums[${i}]='428ceeb0d8b96ac5e4274ef098bde00916f9e1b62369eb3566eaf6f6b3ac3984'
diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf
index 7fd2d854..23852324 100644
--- a/core/pacman/makepkg.conf
+++ b/core/pacman/makepkg.conf
@@ -40,11 +40,13 @@ CPPFLAGS="-D_FORTIFY_SOURCE=2"
 CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fno-plt"
 CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fno-plt"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
+#RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
+#DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT
@@ -87,7 +89,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #
 OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug)
 
-#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
+#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
 INTEGRITY_CHECK=(md5)
 #-- Options to be used when stripping binaries. See `man strip' for details.
 STRIP_BINARIES="--strip-all"
@@ -141,5 +143,5 @@ COMPRESSLZ=(lzip -c -f)
 # EXTENSION DEFAULTS
 #########################################################################
 #
-PKGEXT='.pkg.tar.xz'
+PKGEXT='.pkg.tar.zst'
 SRCEXT='.src.tar.gz'
-- 
cgit v1.2.3