From 4e7bcf7a997cf26e71795dc7129837d8017bcdf5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 12 Jul 2022 20:08:50 +0200 Subject: [PATCH] [python3] Fix wrapper, mark mingw unsupported (#25699) * Fix python3 wrapper * python3 is unsupported on mingw * Update versions --- ports/python3/vcpkg-cmake-wrapper.cmake | 6 ++++++ ports/python3/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/p-/python3.json | 5 +++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ports/python3/vcpkg-cmake-wrapper.cmake b/ports/python3/vcpkg-cmake-wrapper.cmake index 83c3fbd1cf..1e13659b28 100644 --- a/ports/python3/vcpkg-cmake-wrapper.cmake +++ b/ports/python3/vcpkg-cmake-wrapper.cmake @@ -89,6 +89,9 @@ if(_PythonFinder_WantLibs) find_dependency(Intl) if(TARGET @PythonFinder_PREFIX@::Python) get_target_property(_PYTHON_INTERFACE_LIBS @PythonFinder_PREFIX@::Python INTERFACE_LINK_LIBRARIES) + if(NOT _PYTHON_INTERFACE_LIBS) + set(_PYTHON_INTERFACE_LIBS "") + endif() list(REMOVE_ITEM _PYTHON_INTERFACE_LIBS "-liconv" "-lintl") list(APPEND _PYTHON_INTERFACE_LIBS Iconv::Iconv @@ -99,6 +102,9 @@ if(_PythonFinder_WantLibs) endif() if(TARGET @PythonFinder_PREFIX@::Module) get_target_property(_PYTHON_INTERFACE_LIBS @PythonFinder_PREFIX@::Module INTERFACE_LINK_LIBRARIES) + if(NOT _PYTHON_INTERFACE_LIBS) + set(_PYTHON_INTERFACE_LIBS "") + endif() list(REMOVE_ITEM _PYTHON_INTERFACE_LIBS "-liconv" "-lintl") list(APPEND _PYTHON_INTERFACE_LIBS Iconv::Iconv diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 61714a805f..8920a24fd9 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,10 +1,11 @@ { "name": "python3", "version": "3.10.5", + "port-version": 1, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", - "supports": "!uwp", + "supports": "!uwp & !mingw", "dependencies": [ { "name": "bzip2", diff --git a/versions/baseline.json b/versions/baseline.json index c4bbbb4f7b..6650d4a46a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5706,7 +5706,7 @@ }, "python3": { "baseline": "3.10.5", - "port-version": 0 + "port-version": 1 }, "qca": { "baseline": "2.3.4", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 006ac77139..6241a4eccb 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c345c4a8ad91847522188517c68e8f83637f4440", + "version": "3.10.5", + "port-version": 1 + }, { "git-tree": "d7c43b7217707bb35a86859d9285496fc2bce8e2", "version": "3.10.5",