From: Paul Spooren <mail@aparcar.org>
Date: Mon, 13 Nov 2023 22:32:12 +0000 (+0100)
Subject: Revert "prereq-build: add Python 3.12 support"
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=09b7e1955c92e0b05197174b7bd4aef2c4073a35;p=openwrt%2Fstaging%2Fhauke.git

Revert "prereq-build: add Python 3.12 support"

This reverts commit 7ceb76ca3a37ba6b722df39ba0838909fa7cf7b4.

Python 3.12 removes the distutils package and is therefore not
compatible. We have to check downstream what relies on distutils before
adding actual support for Python 3.12. Sorry for the noise.

With this in-place, the macOS CI job fails and turns things red, revert
for now.

Signed-off-by: Paul Spooren <mail@aparcar.org>
---

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 2378f5ad90..49340ce3e4 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -182,7 +182,6 @@ $(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \
 	perl --version | grep "perl.*v5"))
 
 $(eval $(call SetupHostCommand,python,Please install Python >= 3.7, \
-	python3.12 -V 2>&1 | grep 'Python 3', \
 	python3.11 -V 2>&1 | grep 'Python 3', \
 	python3.10 -V 2>&1 | grep 'Python 3', \
 	python3.9 -V 2>&1 | grep 'Python 3', \
@@ -191,7 +190,6 @@ $(eval $(call SetupHostCommand,python,Please install Python >= 3.7, \
 	python3 -V 2>&1 | grep -E 'Python 3\.([7-9]|[0-9][0-9])\.?'))
 
 $(eval $(call SetupHostCommand,python3,Please install Python >= 3.7, \
-	python3.12 -V 2>&1 | grep 'Python 3', \
 	python3.11 -V 2>&1 | grep 'Python 3', \
 	python3.10 -V 2>&1 | grep 'Python 3', \
 	python3.9 -V 2>&1 | grep 'Python 3', \