py311-312-wheels: Fix greenlet 3.x support with gcc <= 8

SynoCommunity · Dec 4, 2024 · 3866121 · 3866121
1 parent 487239e
commit 3866121
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 4 deletions.
diff --git a/spk/python311-wheels/Makefile b/spk/python311-wheels/Makefile
@@ -95,11 +95,11 @@ endif
 include ../../mk/spksrc.python.mk
 
 # [greenlet]
-ifeq ($(call version_ge, $(TC_GCC), 4.9),1)
+ifeq ($(call version_ge, $(TC_GCC), 5.0),1)
 WHEELS += src/requirements-crossenv-greenlet-v3.txt
-ifeq ($(call version_lt, $(TC_GCC), 5.0),1)
+else ifeq ($(call version_ge, $(TC_GCC), 4.9)$(call version_lt, $(TC_GCC), 5.0),11)
+WHEELS += src/requirements-crossenv-greenlet-v3-gcc4.txt
 WHEELS_CPPFLAGS += [greenlet] -std=c++11 -fpermissive
-endif
 else
 WHEELS += src/requirements-crossenv-greenlet-v1.txt
 endif

diff --git a/spk/python311-wheels/src/requirements-crossenv-greenlet-v3-gcc4.txt b/spk/python311-wheels/src/requirements-crossenv-greenlet-v3-gcc4.txt
@@ -0,0 +1,9 @@
+##
+## All configurations below are optional and
+## are provided to demonstrate how to build
+## various wheels.  Uncoment to enable.
+##
+
+# [greenlet]
+#   - Mandatory require full c++11 support
+greenlet==3.0.3
diff --git a/spk/python311-wheels/src/requirements-crossenv-greenlet-v3.txt b/spk/python311-wheels/src/requirements-crossenv-greenlet-v3.txt
@@ -7,4 +7,5 @@
 # [greenlet]
 #   - Mandatory require full c++11 support
 greenlet==3.0.3
+#   - Mandatory require full c++20 support added with gcc >= 8
 greenlet==3.1.1
diff --git a/spk/python312-wheels/Makefile b/spk/python312-wheels/Makefile
@@ -93,8 +93,10 @@ endif
 include ../../mk/spksrc.python.mk
 
 # [greenlet]
-ifeq ($(call version_ge $(TC_GCC), 4.9),1)
+ifeq ($(call version_ge, $(TC_GCC), 5.0),1)
 WHEELS += src/requirements-crossenv-greenlet-v3.txt
+else ifeq ($(call version_ge, $(TC_GCC), 4.9)$(call version_lt, $(TC_GCC), 5.0),11)
+WHEELS += src/requirements-crossenv-greenlet-v3-gcc4.txt
 WHEELS_CPPFLAGS += [greenlet] -std=c++11 -fpermissive
 endif
 

diff --git a/spk/python312-wheels/src/requirements-crossenv-greenlet-v3-gcc4.txt b/spk/python312-wheels/src/requirements-crossenv-greenlet-v3-gcc4.txt
@@ -0,0 +1,9 @@
+##
+## All configurations below are optional and
+## are provided to demonstrate how to build
+## various wheels.  Uncoment to enable.
+##
+
+# [greenlet]
+#   - Mandatory require full c++11 support
+greenlet==3.0.3
diff --git a/spk/python312-wheels/src/requirements-crossenv-greenlet-v3.txt b/spk/python312-wheels/src/requirements-crossenv-greenlet-v3.txt
@@ -7,4 +7,5 @@
 # [greenlet]
 #   - Mandatory require full c++11 support
 greenlet==3.0.3
+#   - Mandatory require full c++20 support added with gcc >= 8
 greenlet==3.1.1