From 0da40a8b53f67f98b0e210a581b82b26947ac97c Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Tue, 12 Dec 2023 17:51:55 +0800 Subject: [PATCH] [python3] Add a warning message for installing autoconf automake and autoconf-archive (#35548) * [python3] Add a warning message for installing autoconf automake and autoconf-archive * Apply suggestion --- ports/python3/portfile.cmake | 15 +++++++++++++++ ports/python3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/python3.json | 5 +++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index a39a2a0ba6..5a498e3715 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -3,6 +3,21 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND VCPKG_CRT_LINKAGE STREQUAL static set(VCPKG_LIBRARY_LINKAGE static) endif() +if(NOT VCPKG_HOST_IS_WINDOWS) + message(WARNING "${PORT} currently requires the following programs from the system package manager: + autoconf automake autoconf-archive +On Debian and Ubuntu derivatives: + sudo apt-get install autoconf automake autoconf-archive +On recent Red Hat and Fedora derivatives: + sudo dnf install autoconf automake autoconf-archive +On Arch Linux and derivatives: + sudo pacman -S autoconf automake autoconf-archive +On Alpine: + apk add autoconf automake autoconf-archive +On macOS: + brew install autoconf automake autoconf-archive\n") +endif() + string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" PYTHON_VERSION "${VERSION}") set(PYTHON_VERSION_MAJOR "${CMAKE_MATCH_1}") set(PYTHON_VERSION_MINOR "${CMAKE_MATCH_2}") diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 7a64699ae1..4f32a58cec 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version": "3.11.5", - "port-version": 2, + "port-version": 3, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 116bba0b24..9a2838a507 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6862,7 +6862,7 @@ }, "python3": { "baseline": "3.11.5", - "port-version": 2 + "port-version": 3 }, "qca": { "baseline": "2.3.7", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 6e12f40b9c..7fd094a947 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6acf202b9752a04a0b9557d1ea9e4fa2f427e8d", + "version": "3.11.5", + "port-version": 3 + }, { "git-tree": "f51d67945e156a17ca72a743f04455a368e73272", "version": "3.11.5",