Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Do not include GCC source code in source tarballs #135658

Merged
merged 1 commit into from
Jan 20, 2025
Merged

Do not include GCC source code in source tarballs #135658

merged 1 commit into from
Jan 20, 2025
+12 −1

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Jan 17, 2025

The licensing story is unclear, it makes the archive much larger, and we should not need it for building anything in the tarballs (yet).

Before:
121s building the archive
1.3 GiB gzipped size
5.7 GiB extracted size
402519 extracted files

After:
64s building the archive
961 MiB gzipped size
4.5 GiB extracted size
257719 extracfed files

Fixes: #135606

r? @ehuss

@Kobzol
Do not include GCC source code in source tarballs
f854f34 
The licensing story is unclear, it makes the archive much larger, and we should not need it for building anything in the tarballs (yet).
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jan 17, 2025
@Kobzol Kobzol mentioned this pull request Jan 17, 2025
Open
jieyouxu
jieyouxu approved these changes Jan 20, 2025
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, you can r=me unless you want @ehuss to look at this specifically.

@Kobzol
Copy link
Contributor Author

Kobzol commented Jan 20, 2025

@bors r=jieyouxu

@bors
Copy link
Contributor

bors commented Jan 20, 2025

📌 Commit f854f34 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 20, 2025
@jieyouxu jieyouxu mentioned this pull request Jan 20, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2025
@bors
Auto merge of rust-lang#135769 - jieyouxu:rollup-3h384pz, r=jieyouxu
9f4d9dc 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#135433 (Add Profile Override for Non-Git Sources)
 - rust-lang#135626 (doc: Point to methods on `Command` as alternatives to `set/remove_var`)
 - rust-lang#135658 (Do not include GCC source code in source tarballs)
 - rust-lang#135676 (rustc_resolve: use structured fields in traces)
 - rust-lang#135762 (Correct counting to four in cell module docs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a41d652 into rust-lang:master Jan 20, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 20, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2025
@rust-timer
Unrolled build for rust-lang#135658
4c79ca4 
Rollup merge of rust-lang#135658 - Kobzol:src-tarball-remove-gcc, r=jieyouxu

Do not include GCC source code in source tarballs

The licensing story is unclear, it makes the archive much larger, and we should not need it for building anything in the tarballs (yet).

```
Before:
121s building the archive
1.3 GiB gzipped size
5.7 GiB extracted size
402519 extracted files

After:
64s building the archive
961 MiB gzipped size
4.5 GiB extracted size
257719 extracfed files
```

Fixes: rust-lang#135606

r? `@ehuss`
@Kobzol Kobzol deleted the src-tarball-remove-gcc branch January 20, 2025 21:58
@stefson
Copy link

stefson commented Jan 21, 2025

@Kobzol: can you please be so kind to backport this to beta and stable branch?

@jieyouxu
Copy link
Member

Nominating for beta and stable backports, poll in https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Backporting.20.23135658.20to.20beta.20and.20stable/near/494974143.

@rustbot label: +beta-nominated +stable-nominated

@rustbot rustbot added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Jan 21, 2025
@Kobzol
Copy link
Contributor Author

Kobzol commented Jan 21, 2025

There's no need to backport to stable, as it was just released, but beta makes sense.

@jieyouxu
Copy link
Member

Ah sorry, missed that.

@jieyouxu jieyouxu removed the stable-nominated Nominated for backporting to the compiler in the stable channel. label Jan 21, 2025
@stefson
Copy link

stefson commented Jan 21, 2025

You might want to queue it up for stable, in case there will be a point release. Like an optional fix, not sure how rust manages these.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@ehuss ehuss

Labels
beta-nominated Nominated for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.86.0
Development

Successfully merging this pull request may close these issues.

rustc-1.83 tarball contains a GCC checkout
6 participants
@Kobzol @bors @stefson @jieyouxu @ehuss @rustbot