From 3e2117bf44fb741e367cb6e3f37b682275fdc2b8 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 23 Apr 2021 06:10:25 +0200
Subject: core/pacman: adopted upstream changes to makepkg.conf

---
 core/pacman/PKGBUILD     | 4 ++--
 core/pacman/makepkg.conf | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'core')

diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index ca56ff47..4f96a690 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -4,8 +4,8 @@ depends+=(archlinux32-keyring)
 
 # fail if upstream changes makepkg.conf or pacman.conf
 for ((i=0; i<${#sha256sums[@]}; i++)); do
-  if [ "${sha256sums[${i}]}" = '9c769f13c09a6f24c393a9762474eded2f269d8966e7764d9160d62232a7919b' ]; then
-    sha256sums[${i}]='b2967ed2b41ac2841b4a367e1f39d698293fe69e95f180486436b5a10b375865'
+  if [ "${sha256sums[${i}]}" = '46a7fda0f2ebd2957db1c0264ed8a659df0916ba30e1353ecc70ef47d2b118ff' ]; then
+    sha256sums[${i}]='7711617e2daaf8cee3221bea3533e94a3e1e4d615b33880a74706754f491e806'
   fi
   if [ "${sha256sums[${i}]}" = '3353f363088c73f1f86a890547c0f87c7473e5caf43bbbc768c2e9a7397f2aa2' ]; then
     sha256sums[${i}]='428ceeb0d8b96ac5e4274ef098bde00916f9e1b62369eb3566eaf6f6b3ac3984'
diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf
index 23852324..c6e79cb9 100644
--- a/core/pacman/makepkg.conf
+++ b/core/pacman/makepkg.conf
@@ -36,9 +36,12 @@ CARCH="i686"
 CHOST="i686-pc-linux-gnu"
 
 #-- Compiler and Linker Flags
-CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fno-plt"
-CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fno-plt"
+CPPFLAGS=""
+CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
+	-Wp,-D_FORTIFY_SOURCE=2,-D_GLIBCXX_ASSERTIONS \
+	-Wformat -Werror=format-security \
+	-fstack-clash-protection -fcf-protection"
+CXXFLAGS="$CFLAGS"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-- 
cgit v1.2.3-70-g09d2