Add support for Python 3.14 on macOS and GNU Linux #443
+199
−35
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| diff --git a/configure.ac b/configure.ac | ||
| index bd0221481c5..f2fb52c1efc 100644 | ||
| --- a/configure.ac | ||
| +++ b/configure.ac | ||
| @@ -1605,10 +1605,6 @@ else # shared is disabled | ||
| fi | ||
| AC_MSG_RESULT([$LDLIBRARY]) | ||
|
|
||
| -if test "$cross_compiling" = yes; then | ||
| - RUNSHARED= | ||
| -fi | ||
| - | ||
| # HOSTRUNNER - Program to run CPython for the host platform | ||
| AC_MSG_CHECKING([HOSTRUNNER]) | ||
| if test -z "$HOSTRUNNER" |
This file contains hidden or 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 |
|---|---|---|
| @@ -64,6 +64,7 @@ aarch64-apple-darwin: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| needs_toolchain: true | ||
| host_cc: clang | ||
| host_cxx: clang++ | ||
| @@ -153,6 +154,7 @@ aarch64-unknown-linux-gnu: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| docker_image_suffix: .cross | ||
| host_cc: /usr/bin/x86_64-linux-gnu-gcc | ||
| host_cxx: /usr/bin/x86_64-linux-gnu-g++ | ||
| @@ -232,6 +234,7 @@ armv7-unknown-linux-gnueabi: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| docker_image_suffix: .cross | ||
| host_cc: /usr/bin/x86_64-linux-gnu-gcc | ||
| host_cxx: /usr/bin/x86_64-linux-gnu-g++ | ||
| @@ -271,6 +274,7 @@ armv7-unknown-linux-gnueabihf: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| docker_image_suffix: .cross | ||
| host_cc: /usr/bin/x86_64-linux-gnu-gcc | ||
| host_cxx: /usr/bin/x86_64-linux-gnu-g++ | ||
| @@ -310,6 +314,7 @@ i686-unknown-linux-gnu: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| needs_toolchain: true | ||
| host_cc: clang | ||
| host_cxx: clang++ | ||
| @@ -354,6 +359,7 @@ mips-unknown-linux-gnu: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| docker_image_suffix: .cross | ||
| host_cc: /usr/bin/x86_64-linux-gnu-gcc | ||
| host_cxx: /usr/bin/x86_64-linux-gnu-g++ | ||
| @@ -393,6 +399,7 @@ mipsel-unknown-linux-gnu: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| docker_image_suffix: .cross | ||
| host_cc: /usr/bin/x86_64-linux-gnu-gcc | ||
| host_cxx: /usr/bin/x86_64-linux-gnu-g++ | ||
| @@ -432,6 +439,7 @@ ppc64le-unknown-linux-gnu: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| docker_image_suffix: .cross | ||
| host_cc: /usr/bin/x86_64-linux-gnu-gcc | ||
| host_cxx: /usr/bin/x86_64-linux-gnu-g++ | ||
| @@ -471,6 +479,7 @@ s390x-unknown-linux-gnu: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| docker_image_suffix: .cross | ||
| host_cc: /usr/bin/x86_64-linux-gnu-gcc | ||
| host_cxx: /usr/bin/x86_64-linux-gnu-g++ | ||
| @@ -554,6 +563,7 @@ x86_64-apple-darwin: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| needs_toolchain: true | ||
| apple_sdk_platform: macosx | ||
| host_cc: clang | ||
| @@ -562,7 +572,7 @@ x86_64-apple-darwin: | ||
| target_cflags: | ||
| - '-arch' | ||
| - 'x86_64' | ||
| - '-mmacosx-version-min=10.15' | ||
|
Comment on lines
-565
to
+575
There was a problem hiding this comment. I think this is fine, but we should also probably fix the upstream to use weak symbols here. There was a problem hiding this comment. See
We could revert this for the next alpha, if we wanted. This is currently unconditional and applies to other CPython versions. I think it's fine regardless. |
||
| # Suppress extremely verbose warnings we see with LLVM 10. | ||
| - '-Wno-nullability-completeness' | ||
| - '-Wno-expansion-to-defined' | ||
| @@ -577,7 +587,7 @@ x86_64-apple-darwin: | ||
| target_ldflags: | ||
| - '-arch' | ||
| - 'x86_64' | ||
| - '-mmacosx-version-min=10.15' | ||
| needs: | ||
| - autoconf | ||
| - bzip2 | ||
| @@ -723,6 +733,7 @@ x86_64-unknown-linux-gnu: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| needs_toolchain: true | ||
| host_cc: clang | ||
| host_cxx: clang++ | ||
| @@ -767,6 +778,7 @@ x86_64_v2-unknown-linux-gnu: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| needs_toolchain: true | ||
| host_cc: clang | ||
| host_cxx: clang++ | ||
| @@ -812,6 +824,7 @@ x86_64_v3-unknown-linux-gnu: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| needs_toolchain: true | ||
| host_cc: clang | ||
| host_cxx: clang++ | ||
| @@ -857,6 +870,7 @@ x86_64_v4-unknown-linux-gnu: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| needs_toolchain: true | ||
| host_cc: clang | ||
| host_cxx: clang++ | ||
| @@ -902,6 +916,7 @@ x86_64-unknown-linux-musl: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| needs_toolchain: true | ||
| host_cc: clang | ||
| host_cxx: clang++ | ||
| @@ -944,6 +959,7 @@ x86_64_v2-unknown-linux-musl: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| needs_toolchain: true | ||
| host_cc: clang | ||
| host_cxx: clang++ | ||
| @@ -987,6 +1003,7 @@ x86_64_v3-unknown-linux-musl: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| needs_toolchain: true | ||
| host_cc: clang | ||
| host_cxx: clang++ | ||
| @@ -1030,6 +1047,7 @@ x86_64_v4-unknown-linux-musl: | ||
| - '3.11' | ||
| - '3.12' | ||
| - '3.13' | ||
| - '3.14' | ||
| needs_toolchain: true | ||
| host_cc: clang | ||
| host_cxx: clang++ | ||
This file contains hidden or 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 |
|---|---|---|
| @@ -511,7 +511,10 @@ def derive_setup_local( | ||
| ) | ||
|
|
||
| if target_match and (python_min_match and python_max_match): | ||
|
There was a problem hiding this comment. The changes in this file in support of an ergonomic expression in d0521dd |
||
| if source := entry.get("source"): | ||
| line += f" {source}" | ||
| for source in entry.get("sources", []): | ||
| line += f" {source}" | ||
|
|
||
| for define in info.get("defines", []): | ||
| line += f" -D{define}" | ||
| @@ -549,7 +552,11 @@ def derive_setup_local( | ||
| ) | ||
|
|
||
| if target_match and (python_min_match and python_max_match): | ||
| # TODO: Change to `include` and drop support for `path` | ||
|
There was a problem hiding this comment. On the fence on this, but think we can just revisit it holistically separately. |
||
| if include := entry.get("path"): | ||
| line += f" -I{include}" | ||
| for include in entry.get("includes", []): | ||
| line += f" -I{include}" | ||
|
|
||
| for path in info.get("includes-deps", []): | ||
| # Includes are added to global search path. | ||
| @@ -562,7 +569,19 @@ def derive_setup_local( | ||
| line += " %s" % link_for_target(lib, target_triple) | ||
|
|
||
| for entry in info.get("links-conditional", []): | ||
| if targets := entry.get("targets", []): | ||
| target_match = any(re.match(p, target_triple) for p in targets) | ||
| else: | ||
| target_match = True | ||
|
|
||
| python_min_match = meets_python_minimum_version( | ||
| python_version, entry.get("minimum-python-version", "1.0") | ||
| ) | ||
| python_max_match = meets_python_maximum_version( | ||
| python_version, entry.get("maximum-python-version", "100.0") | ||
| ) | ||
|
|
||
| if target_match and (python_min_match and python_max_match): | ||
|
Comment on lines
+572
to
+584
There was a problem hiding this comment. Copied from other cases where we support Python versions here. |
||
| line += " %s" % link_for_target(entry["name"], target_triple) | ||
|
|
||
| if "-apple-" in target_triple: | ||
This file contains hidden or 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
This file contains hidden or 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
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.
This was a bug that disabled the macOS builds in the matrix if libc labels were requested.