diff options
| author | Adam Johnson <AdamJohnso@gmail.com> | 2021-10-06 15:53:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-06 12:53:06 -0700 |
| commit | 15dab6a7628cb11cc9bea72a5065eeb473099e7c (patch) | |
| tree | f17c5c5e7e364f32a14b2c97e6cd09ffc12d69ad /ports/python3/0001-static-library.patch | |
| parent | 90e568694e88f423139ddd186288a60bdd7c54c0 (diff) | |
| download | vcpkg-15dab6a7628cb11cc9bea72a5065eeb473099e7c.tar.gz vcpkg-15dab6a7628cb11cc9bea72a5065eeb473099e7c.zip | |
[python3] Upgrade to Python 3.10.0 (#20519)
* [python3] Update to Python 3.10.0rc2 (for testing).
* [python3] Revert trivial patch changes.
* [python3] Bump to 3.10.0 final.
* x-add-version
* update python tools to 3.10.0
* [ecm] Add patch from upstream for Python 3.10.
Remove this on the next release.
* x-add-version
* [python3] Add patch to fix static interpreter.
* x-add-version
Diffstat (limited to 'ports/python3/0001-static-library.patch')
| -rw-r--r-- | ports/python3/0001-static-library.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ports/python3/0001-static-library.patch b/ports/python3/0001-static-library.patch index 93a89a2e3..eef387574 100644 --- a/ports/python3/0001-static-library.patch +++ b/ports/python3/0001-static-library.patch @@ -58,6 +58,20 @@ index 2625d0293d..2f8bdaa931 100644 <PreprocessorDefinitions Condition="$(IncludeExternals)">_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> +diff --git a/Python/sysmodule.c b/Python/sysmodule.c +index ac49f7867a..f3583345ff 100644 +--- a/Python/sysmodule.c ++++ b/Python/sysmodule.c +@@ -2804,6 +2804,9 @@ _PySys_InitCore(PyThreadState *tstate, PyObject *sysdict) + #ifdef MS_COREDLL + SET_SYS("dllhandle", PyLong_FromVoidPtr(PyWin_DLLhModule)); + SET_SYS_FROM_STRING("winver", PyWin_DLLVersionString); ++#elif defined(MS_WINDOWS) ++ SET_SYS("dllhandle", PyLong_FromVoidPtr(NULL)); ++ SET_SYS_FROM_STRING("winver", MS_DLL_ID); + #endif + #ifdef ABIFLAGS + SET_SYS_FROM_STRING("abiflags", ABIFLAGS); -- 2.28.0.windows.1 |