From 05b8ade040bfdd5e97a2f25cd7c6577fdabbcbb5 Mon Sep 17 00:00:00 2001
From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
Date: Tue, 19 Sep 2023 13:40:37 -0400
Subject: [PATCH] profile: move cflags stuff around a little

---
 profiles/pentoo/arch/x86/profile.bashrc    |  5 ++++-
 profiles/pentoo/base/profile.bashrc        |  9 ++++++++-
 profiles/pentoo/zero-system/make.defaults  |  8 ++++----
 profiles/pentoo/zero-system/profile.bashrc | 18 +++++++++++++-----
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/profiles/pentoo/arch/x86/profile.bashrc b/profiles/pentoo/arch/x86/profile.bashrc
index 2cfe25a92..153939803 100644
--- a/profiles/pentoo/arch/x86/profile.bashrc
+++ b/profiles/pentoo/arch/x86/profile.bashrc
@@ -1 +1,4 @@
-if [[ $CATEGORY/$PN == www-client/firefox ]] ; then CFLAGS=${CFLAGS/-ggdb/} CXXFLAGS=${CXXFLAGS/-ggdb/}; fi
+if [[ $CATEGORY/$PN == www-client/firefox ]]; then
+  CFLAGS=${CFLAGS/-ggdb3/} CXXFLAGS=${CXXFLAGS/-ggdb3/};
+  CFLAGS=${CFLAGS/-ggdb/} CXXFLAGS=${CXXFLAGS/-ggdb/};
+fi
diff --git a/profiles/pentoo/base/profile.bashrc b/profiles/pentoo/base/profile.bashrc
index f9e49e282..ed762806a 100644
--- a/profiles/pentoo/base/profile.bashrc
+++ b/profiles/pentoo/base/profile.bashrc
@@ -33,7 +33,14 @@ if [[ $CATEGORY/$PN == sys-libs/binutils-libs ]]; then export CFLAGS="${CFLAGS}
 if [[ $CATEGORY/$PN == net-misc/openssh ]]; then export OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes; fi
 
 #some packages are too big for ggdb
-if [[ $CATEGORY/$PN == www-client/chromium ]] ; then CFLAGS=${CFLAGS/-ggdb/} CXXFLAGS=${CXXFLAGS/-ggdb/}; fi
+if [[ $CATEGORY/$PN == www-client/chromium ]]; then
+  CFLAGS=${CFLAGS/-ggdb3/} CXXFLAGS=${CXXFLAGS/-ggdb3/}
+  CFLAGS=${CFLAGS/-ggdb/} CXXFLAGS=${CXXFLAGS/-ggdb/}
+fi
+if [[ $CATEGORY/$PN == dev-lang/rust ]]; then
+  CFLAGS=${CFLAGS/-ggdb3/} CXXFLAGS=${CXXFLAGS/-ggdb3/}
+  CFLAGS=${CFLAGS/-ggdb/} CXXFLAGS=${CXXFLAGS/-ggdb/}
+fi
 
 #Sign kernel modules, stolen unmodified on 20200514 from:
 #https://wiki.gentoo.org/wiki/Signed_kernel_module_support
diff --git a/profiles/pentoo/zero-system/make.defaults b/profiles/pentoo/zero-system/make.defaults
index 58b31cf99..edf3f17c8 100644
--- a/profiles/pentoo/zero-system/make.defaults
+++ b/profiles/pentoo/zero-system/make.defaults
@@ -11,14 +11,14 @@ PORTAGE_GPG_KEY="0xA5DD1427DD11F94A"
 #PORTAGE_GPG_KEY="0xA29433C0AA431DDC"
 FEATURES="sign"
 
-#REPOMAN_DEFAULT_OPTS="--digest=y"
 ECHANGELOG_USER="Rick Farina <zerochaos@gentoo.org>"
 DCO_SIGNED_OFF_BY="Rick Farina <zerochaos@gentoo.org>"
 
+CFLAGS="${CFLAGS} -flto -Werror=strict-aliasing -Werror=odr -Werror=lto-type-mismatch -Wstringop-overread -Werror=stringop-overread"
 #CFLAGS="${CFLAGS} -Werror=format-security"
-#CXXFLAGS="${CFLAGS}"
-#FCFLAGS="${CFLAGS}"
-#FFLAGS="${CFLAGS}"
+CXXFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
 
 PORTAGE_NICENESS="19"
 
diff --git a/profiles/pentoo/zero-system/profile.bashrc b/profiles/pentoo/zero-system/profile.bashrc
index 6fa10514b..40e4e650c 100644
--- a/profiles/pentoo/zero-system/profile.bashrc
+++ b/profiles/pentoo/zero-system/profile.bashrc
@@ -1,8 +1,3 @@
-CFLAGS="${CFLAGS} -flto -Werror=strict-aliasing -Werror=odr -Werror=lto-type-mismatch -Wstringop-overread -Werror=stringop-overread"
-CXXFLAGS="${CXXFLAGS} -flto -Werror=strict-aliasing -Werror=odr -Werror=lto-type-mismatch -Wstringop-overread -Werror=stringop-overread"
-FCFLAGS="${FCFLAGS} -flto -Werror=strict-aliasing -Werror=odr -Werror=lto-type-mismatch -Wstringop-overread -Werror=stringop-overread"
-FFLAGS="${FFLAGS} -flto -Werror=strict-aliasing -Werror=odr -Werror=lto-type-mismatch -Wstringop-overread -Werror=stringop-overread"
-
 # https://bugs.gentoo.org/877761
 # https://bugs.gentoo.org/860873
 # https://bugs.gentoo.org/861872
@@ -19,6 +14,19 @@ FFLAGS="${FFLAGS} -flto -Werror=strict-aliasing -Werror=odr -Werror=lto-type-mis
 #  fi
 #fi
 
+if [[ ${CATEGORY}/${PN} == media-video/ffmpeg ]]; then
+  export CFLAGS="${CFLAGS/-Werror=stringop-overread/}"
+fi
+if [[ ${CATEGORY}/${PN} == app-crypt/p11-kit ]]; then
+  export CFLAGS="${CFLAGS/-Werror=stringop-overread/}"
+fi
+#if [[ ${CATEGORY}/${PN} == www-client/firefox ]] || [[ ${CATEGORY}/${PN} == mail-client/thunderbird ]]; then
+#  export CFLAGS="${CFLAGS/-Werror=stringop-overread/}"
+#fi
+#if [[ ${CATEGORY}/${PN} == dev-lang/rust ]]; then
+#  export MAKEOPTS="${MAKEOPTS} --shuffle=none"
+#fi
+
 QA_CMP_ARGS='--quiet-nodebug'
 if [[ $CATEGORY/$PN == app-crypt/hashcat ]]; then
   export ALLOW_TEST=all