From 242778f56ea3fc2e42d0a79babd9a0cf1b17a8a3 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Feb 18 2019 12:33:25 +0000
Subject: Reduced default build flags used to build extension modules


Utilize extension_...flags for extension builds.

See https://fedoraproject.org/wiki/Changes/Python_Extension_Flags

Depends on https://src.fedoraproject.org/rpms/redhat-rpm-config/c/e80fa1344a49662fec08d650debf793048c87429

---

diff --git a/python36.spec b/python36.spec
index b2a56a9..ef46f9c 100644
--- a/python36.spec
+++ b/python36.spec
@@ -14,7 +14,7 @@ URL: https://www.python.org/
 #  WARNING  When rebasing to a new Python version,
 #           remember to update the python3-docs package as well
 Version: %{pybasever}.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: Python
 
 
@@ -196,6 +196,7 @@ BuildRequires: ncurses-devel
 
 BuildRequires: pkgconfig
 BuildRequires: readline-devel
+BuildRequires: redhat-rpm-config >= 127
 BuildRequires: sqlite-devel
 BuildRequires: gdb
 
@@ -479,12 +480,6 @@ Requires: python-rpm-macros
 Requires: python3-rpm-macros
 Requires: python3-rpm-generators
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1217376
-# https://bugzilla.redhat.com/show_bug.cgi?id=1496757
-# https://bugzilla.redhat.com/show_bug.cgi?id=1218294
-# TODO change to a specific subpackage once available (#1218294)
-Requires: redhat-rpm-config
-
 Provides: %{name}-2to3 = %{version}-%{release}
 Provides: 2to3 = %{version}-%{release}
 
@@ -591,8 +586,6 @@ so extensions for both versions can co-exist in the same directory.
 
 %else  # with flatpackage
 
-Requires: redhat-rpm-config
-
 # We'll not provide this, on purpose
 # No package in Fedora shall ever depend on flatpackage via this
 %global __requires_exclude ^python\\(abi\\) = 3\\..$
@@ -693,13 +686,21 @@ topdir=$(pwd)
 %endif
 
 # Set common compiler/linker flags
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC -fwrapv"
-export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC -fwrapv"
+# We utilize the %%extension_...flags macros here so users building C/C++
+# extensions with our python won't get all the compiler/linker flags used
+# in Fedora RPMs.
+# Standard library built here will still use the %%build_...flags,
+# Fedora packages utilizing %%py3_build will use them as well
+# https://fedoraproject.org/wiki/Changes/Python_Extension_Flags
+export CFLAGS="%{extension_cflags} -D_GNU_SOURCE -fPIC -fwrapv"
+export CFLAGS_NODIST="%{build_cflags} -D_GNU_SOURCE -fPIC -fwrapv"
+export CXXFLAGS="%{extension_cxxflags} -D_GNU_SOURCE -fPIC -fwrapv"
 export CPPFLAGS="$(pkg-config --cflags-only-I libffi)"
-export OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC -fwrapv"
+export OPT="%{extension_cflags} -D_GNU_SOURCE -fPIC -fwrapv"
 export LINKCC="gcc"
 export CFLAGS="$CFLAGS $(pkg-config --cflags openssl)"
-export LDFLAGS="$RPM_LD_FLAGS -g $(pkg-config --libs-only-L openssl)"
+export LDFLAGS="%{extension_ldflags} -g $(pkg-config --libs-only-L openssl)"
+export LDFLAGS_NODIST="%{build_ldflags} -g $(pkg-config --libs-only-L openssl)"
 
 # We can build several different configurations of Python: regular and debug.
 # Define a common function that does one build:
@@ -1530,6 +1531,10 @@ CheckPython optimized
 # ======================================================
 
 %changelog
+* Mon Feb 18 2019 Miro Hrončok <mhroncok@redhat.com> - 3.6.8-6
+- Reduced default build flags used to build extension modules
+  https://fedoraproject.org/wiki/Changes/Python_Extension_Flags
+
 * Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.6.8-5
 - Rebuild for readline 8.0