diff options
| author | Adam Johnson <AdamJohnso@gmail.com> | 2020-11-20 12:44:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 09:44:51 -0800 |
| commit | 46068e8a37b41a7a0ba4f485a90d88d3a1071f33 (patch) | |
| tree | 41c3fdad552efa9c4cc0d89954690c130d8539e6 /ports/python3/0001-static-library.patch | |
| parent | e803bf11296d8e7900dafb41e7b1224778d33dc6 (diff) | |
| download | vcpkg-46068e8a37b41a7a0ba4f485a90d88d3a1071f33.tar.gz vcpkg-46068e8a37b41a7a0ba4f485a90d88d3a1071f33.zip | |
[python3] Upgrade to 3.9.0 (#14510)
* [python3] Bump to 3.8.6.
* [python3] Bump to 3.9.0.
* [itk] Correct python artifact names.
* [pybind11] Update python artifact names.
* [vcpkg_find_acquire_program] Bump PYTHON3 to 3.9.0.
Diffstat (limited to 'ports/python3/0001-static-library.patch')
| -rw-r--r-- | ports/python3/0001-static-library.patch | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/ports/python3/0001-static-library.patch b/ports/python3/0001-static-library.patch index d9d6024d0..e0824849a 100644 --- a/ports/python3/0001-static-library.patch +++ b/ports/python3/0001-static-library.patch @@ -1,8 +1,19 @@ +From dffd6c572fb60f955bf3d98a87e5739163ab8f3f Mon Sep 17 00:00:00 2001 +From: Adam Johnson <AdamJohnso@gmail.com> +Date: Thu, 28 May 2020 17:25:21 -0400 +Subject: [PATCH 1/2] static library + +builds the pythoncore as a static library instead of a DLL +--- + PC/pyconfig.h | 6 ++++++ + PCbuild/pythoncore.vcxproj | 16 ++++++++++++++-- + 2 files changed, 20 insertions(+), 2 deletions(-) + diff --git a/PC/pyconfig.h b/PC/pyconfig.h -index b6b8d445869bc..35b329f307c12 100644 +index 02216b5068..d359c884e2 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h -@@ -257,6 +257,7 @@ typedef int pid_t; +@@ -252,6 +252,7 @@ typedef int pid_t; /* For Windows the Python core is in a DLL by default. Test Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ @@ -10,7 +21,7 @@ index b6b8d445869bc..35b329f307c12 100644 #if !defined(MS_NO_COREDLL) && !defined(Py_NO_ENABLE_SHARED) # define Py_ENABLE_SHARED 1 /* standard symbol for shared library */ # define MS_COREDLL /* deprecated old symbol */ -@@ -282,6 +283,11 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ +@@ -277,6 +278,11 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ # endif /* _DEBUG */ # endif /* _MSC_VER */ # endif /* Py_BUILD_CORE */ @@ -23,7 +34,7 @@ index b6b8d445869bc..35b329f307c12 100644 #if defined(MS_WIN64) diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index 0666b90f66cc9..ca83b82d8a0fe 100644 +index 2625d0293d..dbe236829a 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -73,7 +73,7 @@ @@ -44,7 +55,7 @@ index 0666b90f66cc9..ca83b82d8a0fe 100644 <PreprocessorDefinitions Condition="$(IncludeExternals)">_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>version.lib;shlwapi.lib;ws2_32.lib;pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> + <Lib> + <TargetMachine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MachineX86</TargetMachine> @@ -60,4 +71,7 @@ index 0666b90f66cc9..ca83b82d8a0fe 100644 + </Lib> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="..\Include\abstract.h" /> + <ClInclude Include="..\Include\Python-ast.h" /> +-- +2.28.0.windows.1 + |