Skip to content

Commit

Permalink
python3: Update to 3.10.1, refresh/remove patches
Browse files Browse the repository at this point in the history
Removed patches:
* 027-bpo-43158-Use-configure-values-for-building-_uuid-ex.patch
  Already merged.
* 029-disable-deprecation-warning.patch
  Packages should be patched/fixed to remove the use of distutils
  instead of disabling this warning.

Also:
* Updates PKG_LICENSE to use the correct SPDX license identifier
* Fixes build for mipsel_24kc_24kf

Fixes openwrt/packages#17217.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
  • Loading branch information
jefferyto authored and 1582130940 committed Nov 7, 2022
1 parent 51fe8ef commit 2af76af
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 174 deletions.
4 changes: 2 additions & 2 deletions lang/python/python3-version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
# Note: keep in sync with setuptools & pip
PYTHON3_VERSION_MAJOR:=3
PYTHON3_VERSION_MINOR:=10
PYTHON3_VERSION_MICRO:=0
PYTHON3_VERSION_MICRO:=1

PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)

PYTHON3_SETUPTOOLS_PKG_RELEASE:=1
PYTHON3_PIP_PKG_RELEASE:=1

PYTHON3_SETUPTOOLS_VERSION:=58.1.0
PYTHON3_PIP_VERSION:=22.0.4
PYTHON3_PIP_VERSION:=21.2.4
13 changes: 11 additions & 2 deletions lang/python/python3/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ 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:=5a99f8e7a6a11a7b98b4e75e0d1303d3832cada5534068f69c7b6222a7b1b002
PKG_HASH:=a7f1265b6e1a5de1ec5c3ec7019ab53413469934758311e9d240c46e5ae6e177

PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
PKG_LICENSE:=Python/2.0
PKG_LICENSE:=PSF-2.0
PKG_LICENSE_FILES:=LICENSE Doc/copyright.rst Doc/license.rst Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi_osx/LICENSE Modules/expat/COPYING
PKG_CPE_ID:=cpe:/a:python:python

Expand Down Expand Up @@ -139,6 +139,15 @@ EXTRA_LDFLAGS+= \
-L$(PKG_BUILD_DIR) \
-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib

# Workaround for hardfloat mips
# https://bugs.python.org/issue46265
ifneq ($(findstring mips,$(CONFIG_ARCH)),)
ifeq ($(CONFIG_HAS_FPU),y)
CONFIGURE_VARS += \
ax_cv_check_cflags___fno_semantic_interposition=no
endif
endif

MAKE_VARS += \
PYTHONSTRICTEXTENSIONBUILD=1

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/setup.py
+++ b/setup.py
@@ -816,7 +816,8 @@ class PyBuildExt(build_ext):
@@ -830,7 +830,8 @@ class PyBuildExt(build_ext):
# only change this for cross builds for 3.3, issues on Mageia
if CROSS_COMPILING:
self.add_cross_compiling_paths()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
@@ -15407,7 +15407,7 @@ $as_echo_n "checking ABIFLAGS... " >&6;
@@ -15638,7 +15638,7 @@ $as_echo_n "checking ABIFLAGS... " >&6;
$as_echo "$ABIFLAGS" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
$as_echo_n "checking SOABI... " >&6; }
Expand All @@ -11,7 +11,7 @@

--- a/configure.ac
+++ b/configure.ac
@@ -4798,7 +4798,7 @@ AC_SUBST(SOABI)
@@ -4820,7 +4820,7 @@ AC_SUBST(SOABI)
AC_MSG_CHECKING(ABIFLAGS)
AC_MSG_RESULT($ABIFLAGS)
AC_MSG_CHECKING(SOABI)
Expand Down
10 changes: 5 additions & 5 deletions lang/python/python3/patches/016-adjust-config-paths.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'_PYTHON_SYSCONFIGDATA_NAME',
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1594,7 +1594,7 @@ libinstall: build_all $(srcdir)/Modules/
@@ -1593,7 +1593,7 @@ libinstall: build_all $(srcdir)/Modules/
esac; \
done; \
done
Expand All @@ -19,7 +19,7 @@
$(DESTDIR)$(LIBDEST); \
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
@@ -1752,7 +1752,7 @@ sharedinstall: sharedmods
@@ -1751,7 +1751,7 @@ sharedinstall: sharedmods
--install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \
--root=$(DESTDIR)/
Expand All @@ -30,7 +30,7 @@
# Here are a couple of targets for MacOSX again, to install a full
--- a/configure
+++ b/configure
@@ -3009,7 +3009,7 @@ $as_echo_n "checking for python interpre
@@ -3019,7 +3019,7 @@ $as_echo_n "checking for python interpre
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5
$as_echo "$interp" >&6; }
Expand All @@ -39,7 +39,7 @@
fi
elif test "$cross_compiling" = maybe; then
as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
@@ -15477,7 +15477,7 @@ fi
@@ -15708,7 +15708,7 @@ fi



Expand All @@ -59,7 +59,7 @@
fi
elif test "$cross_compiling" = maybe; then
AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
@@ -4856,7 +4856,7 @@ fi],
@@ -4878,7 +4878,7 @@ fi],

dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
AC_SUBST(PY_ENABLE_SHARED)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1644,7 +1644,7 @@ python-config: $(srcdir)/Misc/python-con
@@ -1643,7 +1643,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).
Expand Down

This file was deleted.

10 changes: 0 additions & 10 deletions lang/python/python3/patches/029-disable-deprecation-warning.patch

This file was deleted.

0 comments on commit 2af76af

Please sign in to comment.