Merge ~mitchdz/ubuntu/+source/python2.7:mitch/python2.7_flag_opt into ubuntu/+source/python2.7:ubuntu/jammy-devel

[Mitchell Dzurick]

PPA - https://launchpad.net/~mitchdz/+archive/ubuntu/python2.7-optimization-flags

[Mitchell Dzurick (mitchdz)]

Test case is in the attached bug report.

I do plan to apply these changes to the Focal package too, but I would like feedback on the Jammy patch first before Focal is made.

[Lena Voytek (lvoytek)]

This patch looks great, and so do the tests. I just have 1 suggestion and a diff comment. Since this is a full patch and not just a simple diff from upstream, I recommend naming it lp2002043-add-optimization-flags-to-cflags.patch rather than lp2002043-add-optimization-flags-to-cflags.diff. That's just a nitpick though and not a necessary change. Overall LGTM, I can sponsor whenever you'd like.

[Mitchell Dzurick (mitchdz)]

Thanks Lena! I added your suggestions.

I think the print messages I made could be a little much, what do you think? I'd potentially like to shorten it, maybe something like this:

There is a workaround to now inherit optimization CFLAGS when compiling wheels.
To enable this, set APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND in your
environment. See LP: https://launchpad.net/bugs/2002043 for further context.

[Lena Voytek (lvoytek)]

Yeah that looks good to me

[Mitchell Dzurick (mitchdz)]

Thanks, I'm rebuilding the changes in my PPA now. Will wait for it to finish then test again. Usually takes ~3hrs for a build+publish so I'll report back near EOD if things go well.

[Mitchell Dzurick (mitchdz)]

Tested the new package and it LGTM.

# dpkg -s python2.7 | grep Version:
Version: 2.7.18-13ubuntu1.2~jammy10
# rm -rf build/ test.so
# export APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND=""
# python2 setup.py build_ext --inplace | head -n 5
running build_ext
There is a workaround to now inherit optimization CFLAGS when compiling wheels.
To enable this, set APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND in your
environment. See LP: https://launchpad.net/bugs/2002043 for further context.
APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND detected, using workaround.
# # strings build/lib.linux-x86_64-2.7/test.so | grep -- -O
GNU GIMPLE 11.4.0 -mtune=generic -march=x86-64 -g -g -g -g -O2 -O2 -fno-openmp -fno-openacc -fcf-protection=full -fno-strict-aliasing -fwrapv -fstack-protector-strong -ffat-lto-objects -fstack-protector-strong -fPIC -fltrans
GNU C17 11.4.0 -mtune=generic -march=x86-64 -g -g -O2 -fno-strict-aliasing -fwrapv -flto -flto -ffat-lto-objects -fstack-protector-strong -fPIC -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -fcf-protection

# unset APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND
# python2 setup.py build_ext --inplace
running build_ext
There is a workaround to now inherit optimization CFLAGS when compiling wheels.
To enable this, set APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND in your
environment. See LP: https://launchpad.net/bugs/2002043 for further context.
APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND not detected.
# strings build/lib.linux-x86_64-2.7/test.so | grep -- -O
GNU GIMPLE 11.4.0 -mtune=generic -march=x86-64 -g -g -g -g -O2 -fno-openmp -fno-openacc -fcf-protection=full -fno-strict-aliasing -fwrapv -fstack-protector-strong -ffat-lto-objects -fstack-protector-strong -fPIC -fltrans

[Lena Voytek (lvoytek)]

Thanks! uploaded:

dput ubuntu ../python2.7_2.7.18-13ubuntu1.2_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../python2.7_2.7.18-13ubuntu1.2_source.changes: Valid signature from 34B8AD7D9529E793
Checking signature on .dsc
gpg: ../python2.7_2.7.18-13ubuntu1.2.dsc: Valid signature from 34B8AD7D9529E793
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading python2.7_2.7.18-13ubuntu1.2.dsc: done.
  Uploading python2.7_2.7.18-13ubuntu1.2.diff.gz: done.
  Uploading python2.7_2.7.18-13ubuntu1.2_source.buildinfo: done.
  Uploading python2.7_2.7.18-13ubuntu1.2_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 55885af..2f4435b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python2.7 (2.7.18-13ubuntu1.2) jammy; urgency=medium
+
+  * Add d/p/add-optimization-flags-to-cflags.diff: Add optimization flags to
+    cflags when compiling C modules. (LP: #2002043)
+
+ -- Mitchell Dzurick <[e-mail]>  Sun, 15 Oct 2023 12:43:11 -0400
+
 python2.7 (2.7.18-13ubuntu1.1) jammy-security; urgency=medium
 
   * SECURITY UPDATE: Injection Attack
diff --git a/debian/patches/lp2002043-add-optimization-flags-to-cflags.patch b/debian/patches/lp2002043-add-optimization-flags-to-cflags.patch
new file mode 100644
index 0000000..198ba0b
--- /dev/null
+++ b/debian/patches/lp2002043-add-optimization-flags-to-cflags.patch
@@ -0,0 +1,58 @@
+Subject: Add optimization to cflags in sysconfig.py when building C modules.
+
+When compiling C code using python, the resulting binary is not being optimized
+properly. Currently this is caused by the 'OPT' variable never being imported or
+used in distutils/sysconfig.py and not being appended to the cflags variable.
+This patch fixes the issue by importing 'OPT' and appending it to 'cflags'.
+
+Author: Mitchell Dzurick <[e-mail]>
+Date: Sun, 15 Oct 2023 17:50:49 +0300
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2002043
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -190,12 +190,22 @@
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, cflags, extra_cflags, basecflags,
+-         ccshared, ldshared, so_ext, ar, ar_flags,
+-         configure_cppflags, configure_cflags, configure_ldflags) = \
+-            get_config_vars('CC', 'CXX', 'CFLAGS', 'EXTRA_CFLAGS', 'BASECFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS',
+-                            'CONFIGURE_CPPFLAGS', 'CONFIGURE_CFLAGS', 'CONFIGURE_LDFLAGS')
++        lp2002043_ubuntu_cflags_workaround = 'APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND' in os.environ
++
++        if (lp2002043_ubuntu_cflags_workaround):
++            (cc, cxx, cflags, extra_cflags, basecflags, opt,
++            ccshared, ldshared, so_ext, ar, ar_flags,
++            configure_cppflags, configure_cflags, configure_ldflags) = \
++                get_config_vars('CC', 'CXX', 'CFLAGS', 'EXTRA_CFLAGS', 'BASECFLAGS', 'OPT',
++                                'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS',
++                                'CONFIGURE_CPPFLAGS', 'CONFIGURE_CFLAGS', 'CONFIGURE_LDFLAGS')
++        else:
++            (cc, cxx, cflags, extra_cflags, basecflags,
++            ccshared, ldshared, so_ext, ar, ar_flags,
++            configure_cppflags, configure_cflags, configure_ldflags) = \
++                get_config_vars('CC', 'CXX', 'CFLAGS', 'EXTRA_CFLAGS', 'BASECFLAGS',
++                                'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS',
++                                'CONFIGURE_CPPFLAGS', 'CONFIGURE_CFLAGS', 'CONFIGURE_LDFLAGS')
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -228,7 +238,15 @@
+             cflags = ' '.join(str(x) for x in (basecflags, os.environ['CFLAGS'], extra_cflags) if x)
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
+         elif configure_cflags:
+-            cflags = ' '.join(str(x) for x in (basecflags, configure_cflags, extra_cflags) if x)
++            print("There is a workaround to now inherit optimization CFLAGS when compiling wheels.")
++            print("To enable this, set APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND in your")
++            print("environment. See LP: https://launchpad.net/bugs/2002043 for further context.")
++            if (lp2002043_ubuntu_cflags_workaround):
++                print("APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND detected, using workaround.")
++                cflags = ' '.join(str(x) for x in (basecflags, opt, configure_cflags, extra_cflags) if x)
++            else:
++                print("APPLY_LP2002043_UBUNTU_CFLAGS_WORKAROUND not detected.")
++                cflags = ' '.join(str(x) for x in (basecflags, configure_cflags, extra_cflags) if x)
+             ldshared = ldshared + ' ' + configure_cflags
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
diff --git a/debian/patches/series.in b/debian/patches/series.in
index f8a4532..c968800 100644
--- a/debian/patches/series.in
+++ b/debian/patches/series.in
@@ -85,3 +85,4 @@ sphinx4.diff
 skip-tls1.2-tests.diff
 issue46811.diff
 CVE-2015-20107.patch
+lp2002043-add-optimization-flags-to-cflags.patch