mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 04:49:08 +08:00
Python3 compiling triplet x64-windows (#33232)
* Fix python3 x64-windows * x-add-version --all * Update ports/python3/portfile.cmake Replace tabs by spaces Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * versioning --------- Co-authored-by: jjll <jjll@gmv.com> Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com>
This commit is contained in:
parent
6dce771695
commit
ca7b1b15f5
34
ports/python3/0017-fix-win.patch
Normal file
34
ports/python3/0017-fix-win.patch
Normal file
@ -0,0 +1,34 @@
|
||||
diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj
|
||||
index 7d3423251f..7f607742fe 100644
|
||||
--- a/PCbuild/_freeze_module.vcxproj
|
||||
+++ b/PCbuild/_freeze_module.vcxproj
|
||||
@@ -366,7 +366,7 @@
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
<Target Name="_RebuildGetPath" AfterTargets="_RebuildFrozen" Condition="$(Configuration) != 'PGUpdate'">
|
||||
- <Exec Command='"$(TargetPath)" "%(GetPath.ModName)" "%(GetPath.FullPath)" "%(GetPath.IntFile)"' />
|
||||
+ <Exec Command='"$(OutDir)$(TargetName)$(TargetExt)" "%(GetPath.ModName)" "%(GetPath.FullPath)" "%(GetPath.IntFile)"' />
|
||||
|
||||
<Copy SourceFiles="%(GetPath.IntFile)"
|
||||
DestinationFiles="%(GetPath.OutFile)"
|
||||
@@ -378,7 +378,7 @@
|
||||
Condition="'@(_UpdatedGetPath)' != ''" Importance="high" />
|
||||
</Target>
|
||||
<Target Name="_RebuildFrozen" AfterTargets="AfterBuild" Condition="$(Configuration) != 'PGUpdate'">
|
||||
- <Exec Command='"$(TargetPath)" "%(None.ModName)" "%(None.FullPath)" "%(None.IntFile)"' />
|
||||
+ <Exec Command='"$(OutDir)$(TargetName)$(TargetExt)" "%(None.ModName)" "%(None.FullPath)" "%(None.IntFile)"' />
|
||||
|
||||
<Copy SourceFiles="%(None.IntFile)"
|
||||
DestinationFiles="%(None.OutFile)"
|
||||
diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj
|
||||
index c49a8533ad..b1cdf7c8d7 100644
|
||||
--- a/PCbuild/pcbuild.proj
|
||||
+++ b/PCbuild/pcbuild.proj
|
||||
@@ -14,6 +14,6 @@
|
||||
<ItemDefinitionGroup>
|
||||
<FreezeProjects>
|
||||
- <Platform>$(PreferredToolArchitecture)</Platform>
|
||||
+ <Platform>$(Platform)</Platform>
|
||||
<Configuration>$(Configuration)</Configuration>
|
||||
<Configuration Condition="$(Configuration) == 'PGInstrument'">Release</Configuration>
|
||||
<Properties></Properties>
|
@ -47,6 +47,8 @@ if(VCPKG_TARGET_IS_WINDOWS)
|
||||
endif()
|
||||
if(VCPKG_CROSSCOMPILING)
|
||||
list(APPEND PATCHES "0016-fix-win-cross.patch")
|
||||
else()
|
||||
list(APPEND PATCHES "0017-fix-win.patch")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "python3",
|
||||
"version": "3.11.4",
|
||||
"port-version": 2,
|
||||
"port-version": 3,
|
||||
"description": "The Python programming language",
|
||||
"homepage": "https://github.com/python/cpython",
|
||||
"license": "Python-2.0",
|
||||
|
@ -6610,7 +6610,7 @@
|
||||
},
|
||||
"python3": {
|
||||
"baseline": "3.11.4",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"qca": {
|
||||
"baseline": "2.3.5",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "f4df0070e757f97d325679377298c7de091e75f7",
|
||||
"version": "3.11.4",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "4f49a2d2249cb9f81e3a5c83329f383de36faf16",
|
||||
"version": "3.11.4",
|
||||
|
Loading…
Reference in New Issue
Block a user