Skip to content

Do not include GCC source code in source tarballs - #135658

Merged
bors merged 1 commit into
rust-lang:masterfrom
Kobzol:src-tarball-remove-gcc
Jan 20, 2025
Merged

Do not include GCC source code in source tarballs#135658
bors merged 1 commit into
rust-lang:masterfrom
Kobzol:src-tarball-remove-gcc

Conversation

@Kobzol

Copy link
Copy Markdown
Member

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

The licensing story is unclear, it makes the archive much larger, and we should not need it for building anything in the tarballs (yet).
@rustbotrustbot 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

@jieyouxujieyouxu left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
MemberAuthor

@bors r=jieyouxu

@bors

bors commented Jan 20, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit f854f34 has been approved by jieyouxu

It is now in the queue for this repository.

@borsbors 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
@jieyouxujieyouxu mentioned this pull request Jan 20, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2025
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:masterJan 20, 2025
@rustbotrustbot 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
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
Copy Markdown

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

@jieyouxu

Copy link
Copy Markdown
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

@rustbotrustbot 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
Copy Markdown
MemberAuthor

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

@jieyouxu

Copy link
Copy Markdown
Member

Ah sorry, missed that.

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

Copy link
Copy Markdown

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.

@cuviper

Copy link
Copy Markdown
Member

The zulip poll got 3 votes for beta backport, and none against, so I'm moving the process along...

@rustbot label +beta-accepted

@rustbotrustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 5, 2025
@cuvipercuviper mentioned this pull request Feb 6, 2025
@cuvipercuviper modified the milestones: 1.86.0, 1.85.0Feb 6, 2025
@cuvipercuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 6, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 6, 2025
[beta] backports
- Ensure that we don't try to access fields on a non-struct pattern type rust-lang#135222
- Do not include GCC source code in source tarballs rust-lang#135658
- Temporarily bring back `Rvalue::Len` rust-lang#135709
- Add a couple of missing `ensure_sufficient_stacks` rust-lang#136352
- Enable kernel sanitizers for aarch64-unknown-none-softfloat rust-lang#135905
r? cuviper
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

rustc-1.83 tarball contains a GCC checkout

7 participants

@Kobzol@bors@stefson@jieyouxu@cuviper@ehuss@rustbot