CPython: Condense patching, update patch versions, and add 3.11/3.12 #22599
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,65 +1,79 @@ | ||
| sources: | ||
| "3.12.2": | ||
| url: "https://www.python.org/ftp/python/3.12.2/Python-3.12.2.tgz" | ||
| sha256: "a7c4f6a9dc423d8c328003254ab0c9338b83037bd787d680826a5bf84308116e" | ||
| "3.11.9": | ||
| url: "https://www.python.org/ftp/python/3.11.9/Python-3.11.9.tgz" | ||
| sha256: "e7de3240a8bc2b1e1ba5c81bf943f06861ff494b69fda990ce2722a504c6153d" | ||
| "3.10.14": | ||
| url: "https://www.python.org/ftp/python/3.10.14/Python-3.10.14.tgz" | ||
| sha256: "cefea32d3be89c02436711c95a45c7f8e880105514b78680c14fe76f5709a0f6" | ||
| "3.9.19": | ||
| url: "https://www.python.org/ftp/python/3.9.19/Python-3.9.19.tgz" | ||
| sha256: "f5f9ec8088abca9e399c3b62fd8ef31dbd2e1472c0ccb35070d4d136821aaf71" | ||
| "3.8.19": | ||
| url: "https://www.python.org/ftp/python/3.8.19/Python-3.8.19.tgz" | ||
| sha256: "c7fa55a36e5c7a19ec37d8f90f60a2197548908c9ac8b31e7c0dbffdd470eeac" | ||
| patches: | ||
| "3.12.2": | ||
| - patch_file: "patches/3.9/3.9.7-0002-_msi-vcxproj.patch" | ||
| patch_description: "Fix ARM/ARM64 mismatch in project file" | ||
| patch_type: "bugfix" | ||
|
Check warning on line 21 in recipes/cpython/all/conandata.yml
|
||
| - patch_file: "patches/3.12/3.12.1-0001-_ctypes-ffi.patch" | ||
| patch_description: "Support shared libffi" | ||
| patch_type: "portability" | ||
| - patch_file: "patches/3.x-0001-relocatable-python-config.patch" | ||
| patch_description: "Allow package to be relocatable" | ||
| patch_type: "conan" | ||
| - patch_file: "patches/3.12/3.12.1-0002-remove-module-deps.patch" | ||
| patch_description: "Remove section of solution file forcing projects to be built that might not be used for this recipe" | ||
| patch_type: "conan" | ||
| "3.11.8": | ||
| - patch_file: "patches/3.9/3.9.7-0002-_msi-vcxproj.patch" | ||
| patch_description: "Fix ARM/ARM64 mismatch in project file" | ||
| patch_type: "bugfix" | ||
| - patch_file: "patches/3.11/3.11.7-0001-_ctypes-ffi.patch" | ||
|
Check warning on line 35 in recipes/cpython/all/conandata.yml
|
||
| patch_description: "Support shared libffi" | ||
| patch_type: "portability" | ||
| - patch_file: "patches/3.x-0001-relocatable-python-config.patch" | ||
| patch_description: "Allow package to be relocatable" | ||
| patch_type: "conan" | ||
| - patch_file: "patches/3.x-0002-remove-module-deps.patch" | ||
| patch_description: "Remove section of solution file forcing projects to be built that might not be used for this recipe" | ||
| patch_type: "conan" | ||
| "3.10.14": | ||
| - patch_file: "patches/3.9/3.9.7-0002-_msi-vcxproj.patch" | ||
|
Check warning on line 45 in recipes/cpython/all/conandata.yml
|
||
| patch_description: "Fix ARM/ARM64 mismatch in project file" | ||
| patch_type: "bugfix" | ||
| - patch_file: "patches/3.10/3.10.0-0003-_ctypes-ffi.patch" | ||
| patch_description: "Remove duplicate libffi symbols and support shared libffi" | ||
|
Check warning on line 49 in recipes/cpython/all/conandata.yml
|
||
| patch_type: "portability" | ||
| - patch_file: "patches/3.x-0001-relocatable-python-config.patch" | ||
| patch_description: "Allow package to be relocatable" | ||
| patch_type: "conan" | ||
| - patch_file: "patches/3.x-0002-remove-module-deps.patch" | ||
| patch_description: "Remove section of solution file forcing projects to be built that might not be used for this recipe" | ||
| patch_type: "conan" | ||
| "3.9.19": | ||
| - patch_file: "patches/3.9/3.9.7-0002-_msi-vcxproj.patch" | ||
| patch_description: "Fix ARM/ARM64 mismatch in project file" | ||
| patch_type: "bugfix" | ||
| - patch_file: "patches/3.9/3.9.7-0003-_ctypes-ffi.patch" | ||
| patch_description: "Remove duplicate libffi symbols and support shared libffi" | ||
| patch_type: "portability" | ||
|
Check warning on line 63 in recipes/cpython/all/conandata.yml
|
||
| - patch_file: "patches/3.x-0001-relocatable-python-config.patch" | ||
| patch_description: "Allow package to be relocatable" | ||
| patch_type: "conan" | ||
| - patch_file: "patches/3.x-0002-remove-module-deps.patch" | ||
| patch_description: "Remove section of solution file forcing projects to be built that might not be used for this recipe" | ||
| patch_type: "conan" | ||
| "3.8.19": | ||
| - patch_file: "patches/3.8/3.8.12-0002-_ctypes-ffi.patch" | ||
| patch_description: "Remove duplicate libffi symbols and support shared libffi" | ||
| patch_type: "portability" | ||
| - patch_file: "patches/3.x-0001-relocatable-python-config.patch" | ||
| patch_description: "Allow package to be relocatable" | ||
| patch_type: "conan" | ||
| - patch_file: "patches/3.x-0002-remove-module-deps.patch" | ||
| patch_description: "Remove section of solution file forcing projects to be built that might not be used for this recipe" | ||
| patch_type: "conan" | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Ahajha is this a typo?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, yea it is. I have another PR out, I'll fix it in that one.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, great!