py310-311: Numpy 1.25.x require c++17

th0ma7 · th0ma7 · commit ce33ce1a275e · 2023-07-03T15:54:30.000Z
diff --git a/spk/python310/Makefile b/spk/python310/Makefile
@@ -130,7 +130,10 @@ WHEELS += src/requirements-crossenv-numpy-armv5.txt
 # [numpy] <= 1.22.4 (armv7l)
 else ifeq ($(findstring $(ARCH),$(ARMv7L_ARCHS)),$(ARCH))
 WHEELS += src/requirements-crossenv-numpy-armv7l.txt
-else
+else ifeq ($(call version_le, $(TC_GCC), 5.0),1)
+WHEELS += src/requirements-crossenv-numpy-gcc4.txt
+# [numpy] >= 1.25.0 requires c++17
+else ifeq ($(call version_gt, $(TC_GCC), 5.0),1)
 WHEELS += src/requirements-crossenv-numpy.txt
 endif
 # workaround for compiler bug:
diff --git a/spk/python310/src/requirements-crossenv-numpy-gcc4.txt b/spk/python310/src/requirements-crossenv-numpy-gcc4.txt
@@ -0,0 +1,12 @@
+##
+## All configurations below are optional and
+## are provided to demonstrate how to build
+## various wheels.  Uncoment to enable.
+##
+
+# [numpy]
+#   - Require Cython in cross/python311 crossenv
+#   - aarch64-6.1 require workaround WHEELS_CFLAGS=-O0
+#     ref: https://github.com/numpy/numpy/issues/13622
+numpy==1.23.5
+numpy==1.24.4
diff --git a/spk/python310/src/requirements-crossenv-numpy.txt b/spk/python310/src/requirements-crossenv-numpy.txt
@@ -6,8 +6,7 @@
 
 # [numpy]
 #   - Require Cython in cross/python310 crossenv
-#   - aarch64-6.1 require workaround WHEELS_CFLAGS=-O0
-#     ref: https://github.com/numpy/numpy/issues/13622
+#   - Numpy 1.25.x require c++17
 numpy==1.23.5
 numpy==1.24.4
 numpy==1.25.0
diff --git a/spk/python311/Makefile b/spk/python311/Makefile
@@ -128,7 +128,10 @@ ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
 # [numpy] <= 1.22.4 (armv7l)
 ifeq ($(findstring $(ARCH),$(ARMv7L_ARCHS)),$(ARCH))
 WHEELS += src/requirements-crossenv-numpy-armv7l.txt
-else
+else ifeq ($(call version_le, $(TC_GCC), 5.0),1)
+WHEELS += src/requirements-crossenv-numpy-gcc4.txt
+# [numpy] >= 1.25.0 requires c++17
+else ifeq ($(call version_gt, $(TC_GCC), 5.0),1)
 WHEELS += src/requirements-crossenv-numpy.txt
 endif
 endif
diff --git a/spk/python311/src/requirements-crossenv-numpy-gcc4.txt b/spk/python311/src/requirements-crossenv-numpy-gcc4.txt
@@ -0,0 +1,12 @@
+##
+## All configurations below are optional and
+## are provided to demonstrate how to build
+## various wheels.  Uncoment to enable.
+##
+
+# [numpy]
+#   - Require Cython in cross/python311 crossenv
+#   - aarch64-6.1 require workaround WHEELS_CFLAGS=-O0
+#     ref: https://github.com/numpy/numpy/issues/13622
+numpy==1.23.5
+numpy==1.24.4
diff --git a/spk/python311/src/requirements-crossenv-numpy.txt b/spk/python311/src/requirements-crossenv-numpy.txt
@@ -5,9 +5,8 @@
 ##
 
 # [numpy]
-#   - Require Cython in cross/python311 crossenv
-#   - aarch64-6.1 require workaround WHEELS_CFLAGS=-O0
-#     ref: https://github.com/numpy/numpy/issues/13622
+#   - Require Cython in cross/python310 crossenv
+#   - Numpy 1.25.x require c++17
 numpy==1.23.5
 numpy==1.24.4
 numpy==1.25.0
