зеркало из https://github.com/microsoft/vcpkg.git
[python3] adjust sysconfig include dir to match vcpkg layout (#34888)
* [python3] modify sysconfig include dir for vcpkg layout * v db
This commit is contained in:
Родитель
472c17c838
Коммит
1802d39436
|
@ -0,0 +1,27 @@
|
|||
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
|
||||
index ebe371182..e351df7da 100644
|
||||
--- a/Lib/sysconfig.py
|
||||
+++ b/Lib/sysconfig.py
|
||||
@@ -30,9 +30,9 @@
|
||||
'purelib': '{base}/lib/python{py_version_short}/site-packages',
|
||||
'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages',
|
||||
'include':
|
||||
- '{installed_base}/include/python{py_version_short}{abiflags}',
|
||||
+ '{installed_base}/../../include/python{py_version_short}{abiflags}',
|
||||
'platinclude':
|
||||
- '{installed_platbase}/include/python{py_version_short}{abiflags}',
|
||||
+ '{installed_platbase}/../../include/python{py_version_short}{abiflags}',
|
||||
'scripts': '{base}/bin',
|
||||
'data': '{base}',
|
||||
},
|
||||
@@ -51,8 +51,8 @@
|
||||
'platstdlib': '{base}/Lib',
|
||||
'purelib': '{base}/Lib/site-packages',
|
||||
'platlib': '{base}/Lib/site-packages',
|
||||
- 'include': '{installed_base}/Include',
|
||||
- 'platinclude': '{installed_base}/Include',
|
||||
+ 'include': '{installed_base}/../../include/python{py_version_short}{abiflags}',
|
||||
+ 'platinclude': '{installed_base}/../../include/python{py_version_short}{abiflags}',
|
||||
'scripts': '{base}/Scripts',
|
||||
'data': '{base}',
|
||||
},
|
|
@ -18,6 +18,7 @@ set(PATCHES
|
|||
0012-force-disable-curses.patch
|
||||
0014-fix-get-python-inc-output.patch
|
||||
0015-dont-use-WINDOWS-def.patch
|
||||
0018-fix-sysconfig-include.patch
|
||||
)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"name": "python3",
|
||||
"version": "3.11.5",
|
||||
"port-version": 1,
|
||||
"description": "The Python programming language",
|
||||
"homepage": "https://github.com/python/cpython",
|
||||
"license": "Python-2.0",
|
||||
|
|
|
@ -6806,7 +6806,7 @@
|
|||
},
|
||||
"python3": {
|
||||
"baseline": "3.11.5",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"qca": {
|
||||
"baseline": "2.3.7",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "a428056a4e0e86adce9344f051e4678e50e6cb35",
|
||||
"version": "3.11.5",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "52f5c3a91d997108f5acebea1748176156dbefc9",
|
||||
"version": "3.11.5",
|
||||
|
|
Загрузка…
Ссылка в новой задаче