From 80e73e13bbb34e27456e8202d7780e0745b6245b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 6 May 2024 11:41:41 +0200
Subject: [PATCH] Build Python with -O3

https://fedoraproject.org/wiki/Changes/Python_built_with_gcc_O3

Resolves: RHEL-49635
---
 python3.11.spec | 23 ++++++++++++++++++-----
 tests/tests.yml |  3 +++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/python3.11.spec b/python3.11.spec
index 1f98f57..62c405b 100644
--- a/python3.11.spec
+++ b/python3.11.spec
@@ -20,7 +20,7 @@ URL: https://www.python.org/
 #global prerel ...
 %global upstream_version %{general_version}%{?prerel}
 Version: %{general_version}%{?prerel:~%{prerel}}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Python
 
 
@@ -145,6 +145,15 @@ License: Python
 %global py_INSTSONAME_optimized libpython%{LDVERSION_optimized}.so.%{py_SOVERSION}
 %global py_INSTSONAME_debug     libpython%{LDVERSION_debug}.so.%{py_SOVERSION}
 
+# The -O flag for the compiler, optimized builds
+# https://fedoraproject.org/wiki/Changes/Python_built_with_gcc_O3
+%global optflags_optimized -O3
+# The -O flag for the compiler, debug builds
+# -Wno-cpp avoids some warnings with -O0
+%global optflags_debug -O0 -Wno-cpp
+# Remove the default -O2 flag, our flags are applied in %%build/%%install
+%global __global_compiler_flags %(echo '%{__global_compiler_flags}' | sed 's/-O[[:digit:]]//')
+
 # Disable automatic bytecompilation. The python3 binary is not yet be
 # available in /usr/bin when Python is built. Also, the bytecompilation fails
 # on files that test invalid syntax.
@@ -800,12 +809,12 @@ BuildPython() {
 # See also: https://bugzilla.redhat.com/show_bug.cgi?id=1818857
 BuildPython debug \
   "--without-ensurepip --with-pydebug" \
-  "-O0 -Wno-cpp"
+  "%{optflags_debug}"
 %endif # with debug_build
 
 BuildPython optimized \
   "--without-ensurepip %{optimizations_flag}" \
-  ""
+  "%{optflags_optimized}"
 
 # ======================================================
 # Installing the built code:
@@ -904,14 +913,14 @@ EOF
 %if %{with debug_build}
 InstallPython debug \
   %{py_INSTSONAME_debug} \
-  -O0 \
+  "%{optflags_debug}" \
   %{LDVERSION_debug}
 %endif # with debug_build
 
 # Now the optimized build:
 InstallPython optimized \
   %{py_INSTSONAME_optimized} \
-  "" \
+  "%{optflags_optimized}" \
   %{LDVERSION_optimized}
 
 # Install directories for additional packages
@@ -1643,6 +1652,10 @@ CheckPython optimized
 # ======================================================
 
 %changelog
+* Thu Jul 18 2024 Charalampos Stratakis <cstratak@redhat.com> - 3.11.9-4
+- Build Python with -O3
+- https://fedoraproject.org/wiki/Changes/Python_built_with_gcc_O3
+
 * Thu Jul 18 2024 Charalampos Stratakis <cstratak@redhat.com> - 3.11.9-3
 - Security fix for CVE-2024-4032
 Resolves: RHEL-44099
diff --git a/tests/tests.yml b/tests/tests.yml
index 2f9a73b..8c8ce24 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -34,6 +34,9 @@
     - debugtest:
         dir: python/selftest
         run: "VERSION={{ pybasever }} PYTHON=python{{ pybasever }}d X='-i test_check_probes' ./parallel.sh"
+    - optimizedflags:
+        dir: python/flags
+        run: "python{{ pybasever }} ./assertflags.py -O3"
     - debugflags:
         dir: python/flags
         run: "python{{ pybasever }}d ./assertflags.py -O0"