From d4f5759190ce7bbebbeaa4161333c91d0d7a4da1 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 11 Dec 2023 14:34:24 +0800 Subject: [PATCH] python3: Update to 3.11.7, refresh patches Signed-off-by: Jeffery To --- lang/python/python3-version.mk | 2 +- lang/python/python3/Makefile | 2 +- lang/python/python3/patches/003-do-not-run-compileall.patch | 4 ++-- .../python3/patches/025-choose-python-config-version.patch | 2 +- ...5-Refactor-platform-triplet-detection-code-GH-107221.patch | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/python/python3-version.mk b/lang/python/python3-version.mk index 6b21bc61e7..555b1804c0 100644 --- a/lang/python/python3-version.mk +++ b/lang/python/python3-version.mk @@ -8,7 +8,7 @@ # Note: keep in sync with setuptools & pip PYTHON3_VERSION_MAJOR:=3 PYTHON3_VERSION_MINOR:=11 -PYTHON3_VERSION_MICRO:=6 +PYTHON3_VERSION_MICRO:=7 PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR) diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index c555705761..f34fc86951 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -16,7 +16,7 @@ PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO) PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION) -PKG_HASH:=0fab78fa7f133f4f38210c6260d90d7c0d5c7198446419ce057ec7ac2e6f5f38 +PKG_HASH:=18e1aa7e66ff3a58423d59ed22815a6954e53342122c45df20c96877c062b9b7 PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=Python-2.0.1 0BSD diff --git a/lang/python/python3/patches/003-do-not-run-compileall.patch b/lang/python/python3/patches/003-do-not-run-compileall.patch index ed79314f04..7c0044ff89 100644 --- a/lang/python/python3/patches/003-do-not-run-compileall.patch +++ b/lang/python/python3/patches/003-do-not-run-compileall.patch @@ -1,6 +1,6 @@ --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2128,6 +2128,7 @@ libinstall: all $(srcdir)/Modules/xxmodu +@@ -2133,6 +2133,7 @@ libinstall: all $(srcdir)/Modules/xxmodu $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -8,7 +8,7 @@ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST) -f \ -@@ -2155,6 +2156,7 @@ libinstall: all $(srcdir)/Modules/xxmodu +@@ -2160,6 +2161,7 @@ libinstall: all $(srcdir)/Modules/xxmodu $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages diff --git a/lang/python/python3/patches/025-choose-python-config-version.patch b/lang/python/python3/patches/025-choose-python-config-version.patch index ca484f97b4..3c74874c91 100644 --- a/lang/python/python3/patches/025-choose-python-config-version.patch +++ b/lang/python/python3/patches/025-choose-python-config-version.patch @@ -1,6 +1,6 @@ --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2173,7 +2173,7 @@ python-config: $(srcdir)/Misc/python-con +@@ -2178,7 +2178,7 @@ python-config: $(srcdir)/Misc/python-con @ # On Darwin, always use the python version of the script, the shell @ # version doesn't use the compiler customizations that are provided @ # in python (_osx_support.py). diff --git a/lang/python/python3/patches/100-gh-95855-Refactor-platform-triplet-detection-code-GH-107221.patch b/lang/python/python3/patches/100-gh-95855-Refactor-platform-triplet-detection-code-GH-107221.patch index c3e95a3f40..8f1ae5bdc3 100644 --- a/lang/python/python3/patches/100-gh-95855-Refactor-platform-triplet-detection-code-GH-107221.patch +++ b/lang/python/python3/patches/100-gh-95855-Refactor-platform-triplet-detection-code-GH-107221.patch @@ -289,7 +289,7 @@ Signed-off-by: Jeffery To +#endif --- a/configure.ac +++ b/configure.ac -@@ -917,180 +917,14 @@ fi +@@ -925,180 +925,14 @@ fi AC_MSG_CHECKING([for the platform triplet based on compiler characteristics])