Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[python3] Support arm #21528

Merged
merged 6 commits into from
Dec 17, 2021
Merged

[python3] Support arm #21528

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
408dc09
[python3] Support arm on non Windows
Nov 19, 2021
56f56db
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Dec 15, 2021
0dfab43
Support arm on all platform, add host dependency
Dec 15, 2021
aae91bf
version
Dec 15, 2021
996e56e
[pybind11] Add supports
Dec 16, 2021
039edf3
version
Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ports/python3/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
file(GLOB PYTHON_INSTALLERS "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wininst-*.exe")
file(REMOVE ${PYTHON_LIBS} ${PYTHON_INSTALLERS})

if(PYTHON_ALLOW_EXTENSIONS)
# The generated python executable must match the host arch
if(PYTHON_ALLOW_EXTENSIONS AND NOT VCPKG_CROSSCOMPILING)
message(STATUS "Bootstrapping pip")
vcpkg_execute_required_process(COMMAND python -m ensurepip
WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}"
Expand Down
8 changes: 6 additions & 2 deletions ports/python3/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "python3",
"version-semver": "3.10.1",
"port-version": 1,
"port-version": 2,
"description": "The Python programming language",
"homepage": "https://github.com/python/cpython",
"supports": "!(arm | uwp)",
"supports": "!uwp",
"dependencies": [
{
"name": "bzip2",
Expand All @@ -31,6 +31,10 @@
"name": "openssl",
"platform": "!(windows & static)"
},
{
"name": "python3",
"host": true
},
{
"name": "sqlite3",
"platform": "!(windows & static)"
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5478,7 +5478,7 @@
},
"python3": {
"baseline": "3.10.1",
"port-version": 1
"port-version": 2
},
"qca": {
"baseline": "2.3.4",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/python3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "198663bdc6b156d4423eb6ebf085c803f83babf8",
"version-semver": "3.10.1",
"port-version": 2
},
{
"git-tree": "5fe3685d04e62103465074dbe416e3158a6017a8",
"version-semver": "3.10.1",
Expand Down