-
Notifications
You must be signed in to change notification settings - Fork 45
Adjust Ubuntu related patches to build 5.7.1 #149
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
mz2
wants to merge
10
commits into
swiftlang:main
Choose a base branch
from
mz2:5.7.1
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+30
−20
Draft
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
082fc25
Attempted adjustments for 5.7.1
mz2 1e176da
Add --skip-early-swift-driver
mz2 b575664
Add skip-early-swift-driver
mz2 7078d36
Fixing up changelog (need to add the original entry back as well)
mz2 3d3436c
Changelog entry tweaks
mz2 7ab16a8
Drops the --skip-early-swift-driver option
mz2 2bb48e4
Correction to the build preset patch
mz2 6813bf4
Adds skip-build-benchmarks as an attempt of avoiding a build failure.…
mz2 0269dfd
Drop the -sa
mz2 696c47e
Removes the toolchain-benchmarks from the preset
mz2 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| swiftlang (5.6.0-1) focal; urgency=medium | ||
| swiftlang (5.7.1-1) focal; urgency=medium | ||
|
|
||
| * Debian packaging introduction for Swift 5.6. | ||
| * Debian packaging updated for Swift 5.7.1. | ||
|
|
||
| -- Julien Blache <jblache@apple.com> Tue, 15 Mar 2022 16:36:34 -0700 | ||
| -- Matias Piipari <matias.piipari@gmail.com> Tue, 6 Dec 2022 15:53:00 +000 |
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 |
|---|---|---|
|
|
@@ -3,16 +3,18 @@ Description: Make target installation directory a command line option | |
| time on the command line. | ||
| Author: Julien Blache <[email protected]> | ||
|
|
||
| Index: swiftlang-5.6.3/swift/utils/build-presets.ini | ||
| Index: swiftlang-5.7.1/swift/utils/build-presets.ini | ||
| =================================================================== | ||
| --- swiftlang-5.6.3.orig/swift/utils/build-presets.ini | ||
| +++ swiftlang-5.6.3/swift/utils/build-presets.ini | ||
| @@ -831,7 +831,7 @@ install-swiftpm | ||
| --- swiftlang-5.7.1.orig/swift/utils/build-presets.ini | ||
| +++ swiftlang-5.7.1/swift/utils/build-presets.ini | ||
| @@ -824,7 +824,9 @@ install-swiftpm | ||
| install-swift-driver | ||
| install-xctest | ||
| install-libicu | ||
| -install-prefix=/usr | ||
| +install-prefix=%(install_prefix)s | ||
| install-libcxx | ||
| +skip-early-swift-driver | ||
| +skip-build-benchmarks | ||
| install-sourcekit-lsp | ||
| install-swiftdocc | ||
| build-swift-static-stdlib | ||
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 |
|---|---|---|
|
|
@@ -3,11 +3,11 @@ Description: Fix toolchain path for build-script-helper.py | |
| assumption that /usr is used. | ||
| Author: Julien Blache <[email protected]> | ||
|
|
||
| Index: swiftlang-5.6.3/swift/benchmark/scripts/build_script_helper.py | ||
| Index: swiftlang-5.7.1/swift/benchmark/scripts/build_script_helper.py | ||
| =================================================================== | ||
| --- swiftlang-5.6.3.orig/swift/benchmark/scripts/build_script_helper.py | ||
| +++ swiftlang-5.6.3/swift/benchmark/scripts/build_script_helper.py | ||
| @@ -53,7 +53,7 @@ def main(): | ||
| --- swiftlang-5.7.1.orig/swift/benchmark/scripts/build_script_helper.py | ||
| +++ swiftlang-5.7.1/swift/benchmark/scripts/build_script_helper.py | ||
| @@ -51,7 +51,7 @@ def main(): | ||
| if not os.path.isdir(bin_dir): | ||
| os.makedirs(bin_dir) | ||
|
|
||
|
|
@@ -16,21 +16,19 @@ Index: swiftlang-5.6.3/swift/benchmark/scripts/build_script_helper.py | |
| perform_build(args, swiftbuild_path, "debug", "Benchmark_Onone", "-Onone") | ||
| perform_build(args, swiftbuild_path, "release", "Benchmark_Osize", "-Osize") | ||
| perform_build(args, swiftbuild_path, "release", "Benchmark_O", "-O") | ||
| Index: swiftlang-5.6.3/swift/utils/swift_build_support/swift_build_support/products/benchmarks.py | ||
| Index: swiftlang-5.7.1/swift/utils/swift_build_support/swift_build_support/products/benchmarks.py | ||
| =================================================================== | ||
| --- swiftlang-5.6.3.orig/swift/utils/swift_build_support/swift_build_support/products/benchmarks.py | ||
| +++ swiftlang-5.6.3/swift/utils/swift_build_support/swift_build_support/products/benchmarks.py | ||
| @@ -100,13 +100,17 @@ class Benchmarks(product.Product): | ||
| --- swiftlang-5.7.1.orig/swift/utils/swift_build_support/swift_build_support/products/benchmarks.py | ||
| +++ swiftlang-5.7.1/swift/utils/swift_build_support/swift_build_support/products/benchmarks.py | ||
| @@ -100,11 +100,17 @@ class Benchmarks(product.Product): | ||
|
|
||
|
|
||
| def _get_toolchain_path(host_target, product, args): | ||
| - # TODO check if we should prefer using product.install_toolchain_path | ||
| # this logic initially was inside run_build_script_helper | ||
| # and was factored out so it can be used in testing as well | ||
|
|
||
| - toolchain_path = swiftpm.SwiftPM.get_install_destdir(args, | ||
| - host_target, | ||
| - product.build_dir) | ||
| - toolchain_path = product.host_install_destdir(host_target) | ||
| + install_destdir = args.install_destdir | ||
| + if swiftpm.SwiftPM.has_cross_compile_hosts(args): | ||
| + install_destdir = swiftpm.SwiftPM.get_install_destdir(args, | ||
|
|
||
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 looks to be the version used by 5.7.1?