3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 19:25:27 +08:00
Code Issues Projects Releases Wiki Activity

[python3] Support arm (#21528)

Browse Source 
* [python3] Support arm on non Windows

* Support arm on all platform, add host dependency

* version

* [pybind11] Add supports

* version

Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
This commit is contained in:
NancyLi1013 2021-12-17 14:20:11 +08:00 committed by GitHub
parent aa24b585e1
commit 4b35e71e92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/pybind11/vcpkg.json
View File

@ -1,8 +1,10 @@
{ {
"name": "pybind11", "name": "pybind11",
"version-semver": "2.8.1", "version-semver": "2.8.1",
"port-version": 1,
"description": "pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code", "description": "pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code",
"homepage": "https://github.com/pybind/pybind11", "homepage": "https://github.com/pybind/pybind11",
"supports": "!(arm & windows)",
"dependencies": [ "dependencies": [
"python3", "python3",
{ {

3
ports/python3/portfile.cmake
View File

@ -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(GLOB PYTHON_INSTALLERS "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wininst-*.exe")
file(REMOVE ${PYTHON_LIBS} ${PYTHON_INSTALLERS}) 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") message(STATUS "Bootstrapping pip")
vcpkg_execute_required_process(COMMAND python -m ensurepip vcpkg_execute_required_process(COMMAND python -m ensurepip
WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}" WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}"

8
ports/python3/vcpkg.json
View File

@ -1,10 +1,10 @@
{ {
"name": "python3", "name": "python3",
"version-semver": "3.10.1", "version-semver": "3.10.1",
"port-version": 1, "port-version": 2,
"description": "The Python programming language", "description": "The Python programming language",
"homepage": "https://github.com/python/cpython", "homepage": "https://github.com/python/cpython",
"supports": "!(arm | uwp)", "supports": "!uwp",
"dependencies": [ "dependencies": [
{ {
"name": "bzip2", "name": "bzip2",
@ -31,6 +31,10 @@
"name": "openssl", "name": "openssl",
"platform": "!(windows & static)" "platform": "!(windows & static)"
}, },
{
"name": "python3",
"host": true
},
{ {
"name": "sqlite3", "name": "sqlite3",
"platform": "!(windows & static)" "platform": "!(windows & static)"

4
versions/baseline.json
View File

@ -5466,7 +5466,7 @@
}, },
"pybind11": { "pybind11": {
"baseline": "2.8.1", "baseline": "2.8.1",
"port-version": 0 "port-version": 1
}, },
"pystring": { "pystring": {
"baseline": "1.1.3", "baseline": "1.1.3",
@ -5478,7 +5478,7 @@
}, },
"python3": { "python3": {
"baseline": "3.10.1", "baseline": "3.10.1",
"port-version": 1 "port-version": 2
}, },
"qca": { "qca": {
"baseline": "2.3.4", "baseline": "2.3.4",

5
versions/p-/pybind11.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "16618fe9543461ee68ba815f511afacbbcfd8330",
"version-semver": "2.8.1",
"port-version": 1
},
{ {
"git-tree": "893da2421e31681611515d8416a8f1a3b4496b5e", "git-tree": "893da2421e31681611515d8416a8f1a3b4496b5e",
"version-semver": "2.8.1", "version-semver": "2.8.1",

5
versions/p-/python3.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "198663bdc6b156d4423eb6ebf085c803f83babf8",
"version-semver": "3.10.1",
"port-version": 2
},
{ {
"git-tree": "5fe3685d04e62103465074dbe416e3158a6017a8", "git-tree": "5fe3685d04e62103465074dbe416e3158a6017a8",
"version-semver": "3.10.1", "version-semver": "3.10.1",