From 116bfbc5d392bf25fc2b0910b1736f8164883dd9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 12 Mar 2024 04:32:52 +0100 Subject: [PATCH] [python3] Fix missing _ when discovering internal FindPython vars. (#37354) --- ports/python3/vcpkg-cmake-wrapper.cmake | 2 +- ports/python3/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/python3.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/python3/vcpkg-cmake-wrapper.cmake b/ports/python3/vcpkg-cmake-wrapper.cmake index 1e13659b28..9acd72e189 100644 --- a/ports/python3/vcpkg-cmake-wrapper.cmake +++ b/ports/python3/vcpkg-cmake-wrapper.cmake @@ -29,7 +29,7 @@ endif() if(_PythonFinder_WantLibs) find_path( - @PythonFinder_PREFIX@_INCLUDE_DIR + _@PythonFinder_PREFIX@_INCLUDE_DIR NAMES "Python.h" PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" PATH_SUFFIXES "python@PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@" diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index a22e75c939..d1be50b739 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "python3", "version": "3.11.8", + "port-version": 1, "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 fb928ba273..923eead63e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7002,7 +7002,7 @@ }, "python3": { "baseline": "3.11.8", - "port-version": 0 + "port-version": 1 }, "qca": { "baseline": "2.3.7", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index d9ce49d37e..764bef7cfb 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe70d9080f1c1254ec0495eb74f1d0a5c4b747f7", + "version": "3.11.8", + "port-version": 1 + }, { "git-tree": "ce86a5562b977fb3e02bd15d96d2de7c771aed41", "version": "3.11.8",