python packages: further cleanup

- update unsupported archs in cross Makefiles - python311-wheels: avoid multiple versions of greenlet
SynoCommunity · Nov 29, 2024 · 38f9eed · 38f9eed
1 parent 02c60b6
commit 38f9eed
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/cross/python311/Makefile b/cross/python311/Makefile
@@ -11,7 +11,7 @@ PKG_DIR = Python-$(PKG_VERS)
 # And compiler must support std=c++11 (OlD_PPC_ARCHS fail, but ARMv5_ARCHS have no issue).
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 
-BUILD_DEPENDS = native/$(PKG_NAME)
+BUILD_DEPENDS = native/python311
 
 DEPENDS  = cross/zlib cross/sqlite cross/readline cross/ncursesw cross/bzip2 cross/xz
 # required for Sleepycat^WOracle Berkeley DB interface

diff --git a/cross/python312/Makefile b/cross/python312/Makefile
@@ -6,12 +6,10 @@ PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
 PKG_DIR = Python-$(PKG_VERS)
 
-# Platform "powerpc-none-linux-gnuspe" with compiler "gcc" is not supported by the
-# CPython core team, see https://peps.python.org/pep-0011/ for more information.
-# And compiler must support std=c++11 (OlD_PPC_ARCHS fail, but ARMv5_ARCHS have no issue).
-UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+# Compiler must support std=c++11
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
 
-BUILD_DEPENDS = native/$(PKG_NAME)
+BUILD_DEPENDS = native/python312
 
 DEPENDS  = cross/zlib cross/sqlite cross/readline cross/ncursesw cross/bzip2 cross/xz
 # required for Sleepycat^WOracle Berkeley DB interface

diff --git a/cross/python313/Makefile b/cross/python313/Makefile
@@ -6,12 +6,10 @@ PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
 PKG_DIR = Python-$(PKG_VERS)
 
-# Platform "powerpc-none-linux-gnuspe" with compiler "gcc" is not supported by the
-# CPython core team, see https://peps.python.org/pep-0011/ for more information.
-# And compiler must support std=c++11 (OlD_PPC_ARCHS fail, but ARMv5_ARCHS have no issue).
-UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+# Compiler must support std=c++11
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
 
-BUILD_DEPENDS = native/$(PKG_NAME)
+BUILD_DEPENDS = native/python313
 
 DEPENDS  = cross/zlib cross/sqlite cross/readline cross/ncursesw cross/bzip2 cross/xz
 # required for Sleepycat^WOracle Berkeley DB interface

diff --git a/spk/python311-wheels/Makefile b/spk/python311-wheels/Makefile
@@ -96,7 +96,7 @@ include ../../mk/spksrc.python.mk
 
 # [greenlet]
 ifeq ($(call version_ge, $(TC_GCC), 4.9),1)
-WHEELS += src/requirements-crossenv-greenlet-v2.txt
+WHEELS += src/requirements-crossenv-greenlet-v3.txt
 ifeq ($(call version_lt, $(TC_GCC), 5.0),1)
 WHEELS_CPPFLAGS += [greenlet] -std=c++11 -fpermissive
 endif

diff --git a/...src/requirements-crossenv-greenlet-v2.txt → ...rc/requirements-crossenv-greenlet-v32.txt b/...src/requirements-crossenv-greenlet-v2.txt → ...rc/requirements-crossenv-greenlet-v32.txt
@@ -6,5 +6,4 @@
 
 # [greenlet]
 #   - Mandatory require full c++11 support
-greenlet==2.0.2
 greenlet==3.0.3