[rpms/gcc] rhel-f41-base: Adapt to new way of redhat-rpm-config setting fortify flags

[rpms/gcc] rhel-f41-base: Adapt to new way of redhat-rpm-config setting fortify flags

[Florian Weimer]

A new commit has been pushed.

Repo   : rpms/gcc
Branch : rhel-f41-base
Commit : 3dab9de8f0c61a79931f37f5484a69e8e9aa029c
Author : Florian Weimer <fweimer@redhat.com>
Date   : 2023-01-16T21:49:51+01:00
Stats  : +3/-1 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/gcc/c/3dab9de8f0c61a79931f37f5484a69e8e9aa029c?branch=rhel-f41-base

Log:
Adapt to new way of redhat-rpm-config setting fortify flags

---
diff --git a/gcc.spec b/gcc.spec
index 64130fc..693e51c 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -920,7 +920,9 @@ export CONFIG_SITE=NONE
 
 CC=gcc
 CXX=g++
-OPT_FLAGS=`echo %{optflags}|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[123]//g'`
+OPT_FLAGS="%{optflags}"
+OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=[123]//g'`
+OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[123]//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/\(-Wp,\)\?-U_FORTIFY_SOURCE//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-flto=auto//g;s/-flto//g;s/-ffat-lto-objects//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-m64//g;s/-m32//g;s/-m31//g'`