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/0006-fix-duplicate-symbols.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/0006-fix-duplicate-symbols.patch')
| -rw-r--r-- | ports/python3/0006-fix-duplicate-symbols.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/ports/python3/0006-fix-duplicate-symbols.patch b/ports/python3/0006-fix-duplicate-symbols.patch deleted file mode 100644 index 251c0186a..000000000 --- a/ports/python3/0006-fix-duplicate-symbols.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 62e082c1eba79d46ba8ab4b7a556a57a2253d555 Mon Sep 17 00:00:00 2001 -From: Adam Johnson <AdamJohnso@gmail.com> -Date: Fri, 11 Sep 2020 12:35:36 -0400 -Subject: [PATCH 6/6] fix duplicate symbols - ---- - Modules/_winapi.c | 2 +- - Modules/overlapped.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Modules/_winapi.c b/Modules/_winapi.c -index e1672c4785..27148094d2 100644 ---- a/Modules/_winapi.c -+++ b/Modules/_winapi.c -@@ -304,7 +304,7 @@ static PyMemberDef overlapped_members[] = { - {NULL} - }; - --PyTypeObject OverlappedType = { -+static PyTypeObject OverlappedType = { - PyVarObject_HEAD_INIT(NULL, 0) - /* tp_name */ "_winapi.Overlapped", - /* tp_basicsize */ sizeof(OverlappedObject), -diff --git a/Modules/overlapped.c b/Modules/overlapped.c -index cd7869fa8a..319ea0a4b7 100644 ---- a/Modules/overlapped.c -+++ b/Modules/overlapped.c -@@ -1756,7 +1756,7 @@ static PyGetSetDef Overlapped_getsets[] = { - {NULL}, - }; - --PyTypeObject OverlappedType = { -+static PyTypeObject OverlappedType = { - PyVarObject_HEAD_INIT(NULL, 0) - /* tp_name */ "_overlapped.Overlapped", - /* tp_basicsize */ sizeof(OverlappedObject), --- -2.28.0.windows.1 - |