mirror of
https://github.com/openwrt/packages.git
synced 2025-12-20 17:41:20 +00:00
Explicitly disable readline and tkinter modules for host-build.
Host-build will not build if these fail.
- readline isn't a hard requirement for host-python; some minor lack of
functionality would be felt, but nothing terrible
- tkinter is also disabled on the target; but for the host-python we
don't need it either
Dropped patch: 010-no-ncursesw.patch
- Since we're disabling readline in the host build
Drop setuptools from python3 - the only reason we kept it there, was
because it was required by pip; pip is still there and seems to install and
work fine without setuptools. There's also a separate setuptools package in
openwrt anyway:
https://github.com/openwrt/packages/tree/master/lang/python/python-setuptools
Also, Python no longer installs it:
https://github.com/python/cpython/issues/95299
Drop python3-cgi - 08d5923896
Drop distutils - 0faa0ba240
Drop lib2to3 - ae00b810d1
Drop patch: 0001-Adjust-library-header-paths-for-cross-compilation.patch
- A lot of stuff has changed regarding cross-compilation; at this point
it's unclear what we need moving forward.
Drop patch: 006-do-not-add-multiarch-local-paths.patch
- setup.py went away, so no idea if this is needed anymore
Re-applied: 003-do-not-run-compileall.patch
Drop: 008-distutils-use-python-sysroot.patch
- Buildroot seems to have also dropped this; this patch is from them
Added: 09-don-t-run-profile-task-during-cross-build.patch
- For cross_compilation, running the profile-task will not work, it also
mentions this in a comment, but nobody dared to patch it yet (at least
in this release (3.13.9)
Re-applied: 026-openssl-feature-flags.patch
- This could have been dropped completely, but upstream decided to keep
scrypt on by default; for host-build this fails, because OpenWrt keeps
libressl
Drop patch: 100-gh-95855-Refactor-platform-triplet-detection-code-GH-107221.patch
- This was a backport; it probably should have been removed sooner
Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
wip
30 lines
1001 B
Diff
30 lines
1001 B
Diff
--- a/Makefile.pre.in
|
|
+++ b/Makefile.pre.in
|
|
@@ -746,6 +746,7 @@ profile-gen-stamp: profile-clean-stamp
|
|
|
|
# Run task with profile generation build to create profile information.
|
|
profile-run-stamp:
|
|
+ifneq ($(PROFILE_TASK),)
|
|
@echo "Running code to generate profile data (this can take a while):"
|
|
# First, we need to create a clean build with profile generation
|
|
# enabled.
|
|
@@ -759,6 +760,7 @@ profile-run-stamp:
|
|
# This is an expensive target to build and it does not have proper
|
|
# makefile dependency information. So, we create a "stamp" file
|
|
# to record its completion and avoid re-running it.
|
|
+endif
|
|
touch $@
|
|
|
|
# Compile Python binary with profile guided optimization.
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1905,7 +1905,7 @@ fi
|
|
|
|
AC_ARG_VAR([PROFILE_TASK], [Python args for PGO generation task])
|
|
AC_MSG_CHECKING([PROFILE_TASK])
|
|
-if test -z "$PROFILE_TASK"
|
|
+if test -z "$PROFILE_TASK" -a "x$cross_compiling" = xno
|
|
then
|
|
PROFILE_TASK='-m test --pgo --timeout=$(TESTTIMEOUT)'
|
|
fi
|