| 08fafdc1 | 05-Jun-2026 |
Jim Jagielski <jimjag@gmail.com> |
AOO42X: revert the Python 3.10 changes, keep arm64 support
The combined backport (cd15cd7435) brought both the macOS arm64 work and a bundled-Python 2.7->3.10 baseline to AOO42X. Per decision, AOO42
AOO42X: revert the Python 3.10 changes, keep arm64 support
The combined backport (cd15cd7435) brought both the macOS arm64 work and a bundled-Python 2.7->3.10 baseline to AOO42X. Per decision, AOO42X should NOT carry the Python 3 migration (a release branch keeps its known Python 2.7), but MUST keep the Apple Silicon support.
Verified none of the 5 Python-changed files contain any arch-specific code and no arm64 file depends on the Python version, so reverting them does not affect arm64 support. Restore to their pre-backport AOO42X state (b4fbd80c76): - python/pyversion.mk, pyversion_dmake.mk (back to 2.7.18) - pyuno/source/loader/pythonloader.py (imp, file()) - scripting/source/pyprov/pythonscript.py (imp.new_module) - scripting/source/pyprov/mailmerge.py (Py2 email module imports)
All arm64 changes (bridge, build plumbing, externals, packaging, JVM discovery, the aoo-420-release.xml arm64 entry) are untouched. The Py3 work remains on trunk.
show more ...
|