From c842fd2a016db98bd214179224c0d8600ad03e0e Mon Sep 17 00:00:00 2001 From: Alina Lenk Date: Thu, 21 Sep 2023 16:13:21 +0200 Subject: [PATCH] Increase minimum Python version for autotools build to track meson build requirements See osdn #44767 Signed-off-by: Alina Lenk --- INSTALL | 7 +++++-- autogen.sh | 2 +- doc/README.packaging | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/INSTALL b/INSTALL index fdbc51b42c..2166aff733 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ Installing Freeciv: This file describes how to compile and install Freeciv. Last time we made sure this file is up to date was 16-Jul-06. -Last minor update was 07-Sep-23. +Last minor update was 21-Sep-23. There may be a localized version of this file in the ./doc directory, named INSTALL. (e.g., INSTALL.de). @@ -108,9 +108,12 @@ contains the generated files. Automake is required to create the various Makefile.in from Makefile.am. - - Python version 3.5 + - Python version 3.6 Some source files are generated by python scripts. + In general, the minimum supported python version will follow + that required for the meson build's minimum meson version; + see INSTALL.meson for that. 1. Prerequisites for the clients: diff --git a/autogen.sh b/autogen.sh index c08a746d23..64a19082e8 100755 --- a/autogen.sh +++ b/autogen.sh @@ -249,7 +249,7 @@ ACLOCAL=$REALPKGNAME real_package_name "libtoolize" "ftp://ftp.gnu.org/pub/gnu/libtool/" 2 2 || real_package_name "glibtoolize" "ftp://ftp.gnu.org/pub/gnu/libtool/" 2 2 "" "0" || DIE=1 LIBTOOLIZE=$REALPKGNAME -real_package_name "python3" "https://www.python.org/" 3 5 || DIE=1 +real_package_name "python3" "https://www.python.org/" 3 6 || DIE=1 if [ "$FC_USE_NLS" = "yes" ]; then DIE2=0 diff --git a/doc/README.packaging b/doc/README.packaging index 202cf727cd..853932413a 100644 --- a/doc/README.packaging +++ b/doc/README.packaging @@ -30,6 +30,7 @@ Updating from 3.2 to 3.3 * va_copy support is now mandatory * Building web version of the server with autotools is no longer supported. Make such builds with meson instead. +* Minimum Python requirement for code generation scripts is 3.6. ---------------------------------------------------------------------- Compatibility of modified versions -- 2.34.1