Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame] | 1 | This regex decides whether to use O3 opimisation on numpy or not. |
| 2 | |
| 3 | It includes "od", which happens to be a substring of "reproducible" |
| 4 | but not "qemux86-world". |
| 5 | |
| 6 | The regex will run against all compiler options including things like: |
| 7 | |
| 8 | -fmacro-prefix-map=/XXX/build/tmp/work/core2-64-poky-linux/python3-numpy/1.26.0/numpy-1.26.0=/usr/src/debug/python3-numpy/1.26.0-r0 |
| 9 | |
| 10 | i.e. including build paths. |
| 11 | |
| 12 | Reduce the regex to something deterministic for our builds, assuming |
| 13 | nobody builds in /home/debug:full/ |
| 14 | |
| 15 | The autobuilder race depended upon whether qemux86-world or the |
| 16 | reproducible target ran first and won the race to populate sstate. |
| 17 | |
| 18 | Upstream-Status: Inappropriate [upstream have dropped distutils and switched to meson] |
| 19 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 20 | |
| 21 | Index: numpy-1.26.0/numpy/distutils/ccompiler_opt.py |
| 22 | =================================================================== |
| 23 | --- numpy-1.26.0.orig/numpy/distutils/ccompiler_opt.py |
| 24 | +++ numpy-1.26.0/numpy/distutils/ccompiler_opt.py |
| 25 | @@ -990,7 +990,7 @@ class _CCompiler: |
| 26 | ("cc_is_nocc", "", ""), |
| 27 | ) |
| 28 | detect_args = ( |
| 29 | - ("cc_has_debug", ".*(O0|Od|ggdb|coverage|debug:full).*", ""), |
| 30 | + ("cc_has_debug", ".*debug:full.*", ""), |
| 31 | ("cc_has_native", |
| 32 | ".*(-march=native|-xHost|/QxHost|-mcpu=a64fx).*", ""), |
| 33 | # in case if the class run with -DNPY_DISABLE_OPTIMIZATION |