CPython: Conan 2.0 #21387
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 |
|---|---|---|
|
|
@@ -8,65 +8,58 @@ | |
| "3.8.12": | ||
| url: "https://www.python.org/ftp/python/3.8.12/Python-3.8.12.tgz" | ||
| sha256: "316aa33f3b7707d041e73f246efedb297a70898c4b91f127f66dc8d80c596f1a" | ||
| patches: | ||
| "3.10.0": | ||
| - patch_file: "patches/3.10/3.10.0-0001-msvc.patch" | ||
| patch_description: "Version specific patches to MSVC projects to allow injection of dependencies" | ||
| patch_type: "conan" | ||
| - 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.10/3.10.0-0003-_ctypes-ffi.patch" | ||
|
Check warning on line 19 in recipes/cpython/all/conandata.yml
|
||
| patch_description: "Remove duplicate libffi symbols and support shared libffi" | ||
| patch_type: "portability" | ||
| - patch_file: "patches/3.10/3.10.0-0004-setup.py-pass-CFLAGS-CPPFLAGS.patch" | ||
| patch_description: "Pass C and CPP flags from configure script to setup.py" | ||
| patch_type: "bugfix" | ||
| - patch_file: "patches/3.10/3.10.0-0005-disable-macos-tcltk.patch" | ||
|
Check warning on line 25 in recipes/cpython/all/conandata.yml
|
||
| patch_description: "Unconditionally enable tcl/tk on Mac" | ||
| patch_type: "conan" | ||
| - patch_file: "patches/3.x-0001-relocatable-python-config.patch" | ||
| patch_description: "Allow package to be relocatable" | ||
| patch_type: "conan" | ||
| "3.9.7": | ||
| - patch_file: "patches/3.9/3.9.7-0001-msvc.patch" | ||
| patch_description: "Version specific patches to MSVC projects to allow injection of dependencies" | ||
| patch_type: "conan" | ||
| - 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" | ||
|
Check warning on line 39 in recipes/cpython/all/conandata.yml
|
||
| patch_type: "portability" | ||
| - patch_file: "patches/3.9/3.9.7-0004-setup.py-pass-CFLAGS-CPPFLAGS.patch" | ||
| patch_description: "Pass C and CPP flags from configure script to setup.py" | ||
| patch_type: "bugfix" | ||
| - patch_file: "patches/3.9/3.9.7-0005-disable-macos-tcltk.patch" | ||
| patch_description: "Unconditionally enable tcl/tk on Mac" | ||
|
Check warning on line 45 in recipes/cpython/all/conandata.yml
|
||
| patch_type: "conan" | ||
| - patch_file: "patches/3.x-0001-relocatable-python-config.patch" | ||
| patch_description: "Allow package to be relocatable" | ||
| patch_type: "conan" | ||
| "3.8.12": | ||
| - patch_file: "patches/3.8/3.8.12-0001-msvc.patch" | ||
| patch_description: "Version specific patches to MSVC projects to allow injection of dependencies" | ||
| patch_type: "conan" | ||
| - 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.8/3.8.12-0003-setup.py-pass-CFLAGS-CPPFLAGS.patch" | ||
| patch_description: "Pass C and CPP flags from configure script to setup.py" | ||
| patch_type: "bugfix" | ||
| - patch_file: "patches/3.8/3.8.12-0004-disable-macos-tcltk.patch" | ||
| patch_description: "Unconditionally enable tcl/tk on Mac" | ||
| patch_type: "conan" | ||
|
Check warning on line 62 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" | ||
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.
For the shake of the recipe being perfect, can we get the rest of the patch fields added for patches? It will make future maintainability so much easier!
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.
I do plan on removing the MSVC patches in a future PR, but for now I can document all of them.
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.
Finally got around to adding these. A few notes on some of the patches, some are irrelevant upstream as the relevant sections have been removed for one reason or another:
patches/3.9/3.9.7-0002-_msi-vcxproj.patch:msilibis removed in 3.13: python/cpython#104911patches/3.10/3.10.0-0004-setup.py-pass-CFLAGS-CPPFLAGS.patch: The setup.py script is entirely removed in 3.12patches/3.10/3.10.0-0005-disable-macos-tcltk.patch: This is in setup.py, I think the relevant section is removed in 3.11, though again regardless the whole script is removed in 3.12