[openwrt-22.03] python3: Update to 3.10.11, refresh/restore patches; cherry pick fixes #21156
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oversight from when the expat host build was removed. Signed-off-by: Rosen Penev <[email protected]> (cherry picked from commit d09844e) Signed-off-by: Jeffery To <[email protected]>
--without-pymalloc was added in 7bf1ae6 because leaving it enabled added an "m" flag/suffix to file names. This flag/suffix was removed in Python 3.8[1], so disabling pymalloc is no longer necessary. [1]: https://docs.python.org/3.8/whatsnew/3.8.html#build-and-c-api-changes Signed-off-by: Jeffery To <[email protected]> (cherry picked from commit 3032e70, adjusted PKG_RELEASE) Signed-off-by: Jeffery To <[email protected]>
003-do-not-run-distutils-tests.patch was removed in 4e05541. This patch stopped "make install" from, among other things, running compileall. When this patch was removed, "make install" ran compileall as normal and created bytecode files in __pycache__ directories. These files were then packaged in python3-light. This adds a patch to stop compileall from being run during "make install". Fixes: 4e05541 ("python3: bump to version 3.10.0") Signed-off-by: Jeffery To <[email protected]> (cherry picked from commit 8a4da01, adjusted PKG_RELEASE, refreshed patches) Signed-off-by: Jeffery To <[email protected]>
The Makefile lines to add READELF to TARGET_CONFIGURE_OPTS was removed in 4e05541. Without setting READELF, configure finds the symlink to $(TARGET_CROSS)readelf (e.g. arm-openwrt-linux-readelf) instead of $(TARGET_CROSS)readelf (e.g. arm-openwrt-linux-muslgnueabi-readelf). This leads to the symlink name being saved to _sysconfigdata.py, and so the readelf name is not replaced correctly (in Py3Package/python3-base/install). This restores the removed Makefile lines. Fixes: 4e05541 ("python3: bump to version 3.10.0") Signed-off-by: Jeffery To <[email protected]> (cherry picked from commit e1a9578, adjusted PKG_RELEASE) Signed-off-by: Jeffery To <[email protected]>
When doing parallel builds, host Python can install the python3 symlink before the Python standard library is installed completely. When this occurs, it is possible for other packages to detect the python3 symlink and try to use host Python before it is fully installed. This adds a patch to make commoninstall (where the standard library is installed) a prerequisite of bininstall (where the python3 symlink is installed), so that commoninstall is fully completed before bininstall begins. Patch has been submitted upstream: python/cpython#104693 Fixes: openwrt#19241 Signed-off-by: Jeffery To <[email protected]> (cherry picked from commit 67e47f1) Signed-off-by: Jeffery To <[email protected]>
By default, the Python build process will add /usr/local/{lib,include},
and multiarch paths (e.g. /usr/{lib,include}/x86_64-linux-gnu) if
building on Debian/Ubuntu, to its library and includes paths.
006-remove-multi-arch-and-local-paths.patch was added in
84202f1 to stop the Python build
process from adding these paths.
006-remove-multi-arch-and-local-paths.patch was removed in
48277ec.
006-do-not-add-multiarch-paths-when-cross-compiling.patch was added in
0c8b0b0 to stop the Python build
process from adding these paths for target Python.
These paths are still added by the Python build process when building
host Python.
This replaces the cross-compiling-only patch with the original patch,
renamed slightly and adapted for Python 3.10.
Fixes: 48277ec ("python3: bump to version 3.8")
Signed-off-by: Jeffery To <[email protected]>
(cherry picked from commit f006d0e,
adjusted PKG_RELEASE)
Signed-off-by: Jeffery To <[email protected]>
This adds $(STAGING_DIR_HOST)/include/e2fsprogs to HOST_CFLAGS and HOST_CPPFLAGS so that configure can find uuid/uuid.h. Signed-off-by: Jeffery To <[email protected]> (cherry picked from commit 44fb492, adjusted PKG_RELEASE) Signed-off-by: Jeffery To <[email protected]>
This updates 026-openssl-feature-flags.patch with a newer version from OpenBSD[1]. This also adds 029-no-FIPS_mode.patch to patch out a call to FIPS_mode(). LibreSSL 3.4 does not have a function definition for FIPS_mode. [1]: https://github.com/openbsd/ports/blob/26a04435bf2a09dcbe22b718bfee08997617a906/lang/python/3.10/patches/patch-Modules__hashopenssl_c Signed-off-by: Jeffery To <[email protected]>
This also restores (and updates) a patch for pip that was removed earlier but is still necessary. Fixes: 7a756db ("python3: bump to version 3.10.9") Signed-off-by: Jeffery To <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Maintainer: me
Compile tested: armvirt-32, 22.03.5 sdk
Run tested: armvirt-32 (qemu), 22.03.5
Description: