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

Update libc to 0.2.144 #12098

Merged
merged 1 commit into from May 10, 2023
Merged

Update libc to 0.2.144 #12098

merged 1 commit into from May 10, 2023

Conversation

heiher
Copy link
Contributor

@heiher heiher commented May 7, 2023 •
edited by weihanglo
Loading

What does this PR try to resolve?

cargo cannot build successfully on LoongArch:

error[E0425]: cannot find value `FICLONE` in module `c`
   --> /home/hev/.cargo/registry/src/index.crates.io-6f17d22bba15001f/rustix-0.37.15/src/backend/libc/io/syscalls.rs:356:16
    |
356 |             c::FICLONE as _,
    |                ^^^^^^^ not found in `c`

This is caused by some constants are missing in libc and fixed after libc 0.2.143 release.

libc changelog: https://github.com/rust-lang/libc/releases/tag/0.2.143
https://github.com/rust-lang/libc/releases/tag/0.2.144

How should we test and review this PR?

cargo build && cargo test

Additional information

None

@rustbot
Copy link
Collaborator

rustbot commented May 7, 2023

r? @weihanglo

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 7, 2023
@heiher heiher mentioned this pull request May 7, 2023
Merged
9 tasks
weihanglo
weihanglo reviewed May 7, 2023
View reviewed changes
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

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

Hello. It would be better if we could have more context of this pull request, or an well-written issue tracking something else. Otherwise it is easy to get lost in version bumps.

Some good examples:

@heiher
Copy link
Contributor Author

heiher commented May 7, 2023

Thanks for your good suggestions! The descriptions has been updated, I will try to do better.

@heiher heiher requested a review from weihanglo May 7, 2023 16:11
weihanglo
weihanglo reviewed May 7, 2023
View reviewed changes
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

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

Given Cargo doesn't directly use the code failing to compile, I would suggest bump the version over there. Perhaps rustix instead?

@heiher
Copy link
Contributor Author

heiher commented May 7, 2023

I thought so too. The interesting thing is rustix does not lock to libc 0.1.142. In other words, rustix can build successfully immediately after libc 0.1.143 is released. I will try more about how to bump it. Thanks for your good suggestions.

@heiher
Copy link
Contributor Author

heiher commented May 8, 2023

@weihanglo Even if we update rustix (though it doesn't lock libc), eventually the cargo project's Cargo.lock needs to be updated, right? Would it be possible to do like #12014? Thank you.

@heiher heiher mentioned this pull request May 8, 2023
Merged
@heiher heiher changed the title Update libc to 0.2.143 Update libc to 0.2.144 May 8, 2023
weihanglo
weihanglo reviewed May 9, 2023
View reviewed changes
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

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

Just be clear. I was concerned about this thing happening again: #11840 (comment).

We should also bump libc in Cargo's Cargo.toml as well.

@heiher
Copy link
Contributor Author

heiher commented May 9, 2023

I apologize for my previous misunderstanding. I noticed that there was a difference in the dependency definition of libc between the Cargo.toml and Cargo.lock files, and mistakenly assumed that they shouldn't be strictly synchronized. However, I'm still unclear about the reasons. I would greatly appreciate it if you could enlighten me on this matter.

@weihanglo
Copy link
Member

Cargo.lock is only considered when building the cargo executable. What about community cargo subcommands and plugins? I was wanting to ensure a smooth user experience throughout the whole ecosystem. Also, to prevent any accidental downgrade of locked dependencies in the future.

@heiher
Copy link
Contributor Author

heiher commented May 9, 2023

Thanks for your explanation.

@heiher heiher requested a review from weihanglo May 9, 2023 14:09
weihanglo
weihanglo approved these changes May 10, 2023
View reviewed changes
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

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

Thanks for the update and the patience!

@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented May 10, 2023

📌 Commit 526f5ae has been approved by weihanglo

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 May 10, 2023
@bors
Copy link
Contributor

bors commented May 10, 2023

⌛ Testing commit 526f5ae with merge a5460e5...

@bors
Copy link
Contributor

bors commented May 10, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing a5460e5 to master...

@bors bors merged commit a5460e5 into rust-lang:master May 10, 2023
@heiher heiher mentioned this pull request May 11, 2023
Merged
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request May 11, 2023
@Dylan-DPC
Rollup merge of rust-lang#111456 - loongarch-rs:bump-cargo, r=weihanglo
5f66444 
Update cargo

2 commits in 26b73d15a68fb94579f6d3590585ec0e9d81d3d5..13413c64ff88dd6c2824e9eb9374fc5f10895d28
2023-05-09 20:28:03 +0000 to 2023-05-10 13:46:18 +0000

* Update libc to 0.2.144 (rust-lang/cargo#12098)
* changelog: add entries of some behavior changes (rust-lang/cargo#12119)

r? `@weihanglo`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 11, 2023
@matthiaskrgr
Rollup merge of rust-lang#111456 - loongarch-rs:bump-cargo, r=weihanglo
c58dd49 
Update cargo

2 commits in 26b73d15a68fb94579f6d3590585ec0e9d81d3d5..13413c64ff88dd6c2824e9eb9374fc5f10895d28
2023-05-09 20:28:03 +0000 to 2023-05-10 13:46:18 +0000

* Update libc to 0.2.144 (rust-lang/cargo#12098)
* changelog: add entries of some behavior changes (rust-lang/cargo#12119)

r? ``@weihanglo``
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 11, 2023
@matthiaskrgr
Rollup merge of rust-lang#111456 - loongarch-rs:bump-cargo, r=weihanglo
4af08eb 
Update cargo

2 commits in 26b73d15a68fb94579f6d3590585ec0e9d81d3d5..13413c64ff88dd6c2824e9eb9374fc5f10895d28
2023-05-09 20:28:03 +0000 to 2023-05-10 13:46:18 +0000

* Update libc to 0.2.144 (rust-lang/cargo#12098)
* changelog: add entries of some behavior changes (rust-lang/cargo#12119)

r? ```@weihanglo```
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 11, 2023
@matthiaskrgr
Rollup merge of rust-lang#111456 - loongarch-rs:bump-cargo, r=weihanglo
fe37a72 
Update cargo

2 commits in 26b73d15a68fb94579f6d3590585ec0e9d81d3d5..13413c64ff88dd6c2824e9eb9374fc5f10895d28
2023-05-09 20:28:03 +0000 to 2023-05-10 13:46:18 +0000

* Update libc to 0.2.144 (rust-lang/cargo#12098)
* changelog: add entries of some behavior changes (rust-lang/cargo#12119)

r? ````@weihanglo````
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 11, 2023
@matthiaskrgr
Rollup merge of rust-lang#111456 - loongarch-rs:bump-cargo, r=weihanglo
4a632f3 
Update cargo

2 commits in 26b73d15a68fb94579f6d3590585ec0e9d81d3d5..13413c64ff88dd6c2824e9eb9374fc5f10895d28
2023-05-09 20:28:03 +0000 to 2023-05-10 13:46:18 +0000

* Update libc to 0.2.144 (rust-lang/cargo#12098)
* changelog: add entries of some behavior changes (rust-lang/cargo#12119)

r? `````@weihanglo`````
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 12, 2023
@matthiaskrgr
Rollup merge of rust-lang#111456 - loongarch-rs:bump-cargo, r=weihanglo
1d4689c 
Update cargo

2 commits in 26b73d15a68fb94579f6d3590585ec0e9d81d3d5..13413c64ff88dd6c2824e9eb9374fc5f10895d28
2023-05-09 20:28:03 +0000 to 2023-05-10 13:46:18 +0000

* Update libc to 0.2.144 (rust-lang/cargo#12098)
* changelog: add entries of some behavior changes (rust-lang/cargo#12119)

r? ``````@weihanglo``````
bors added a commit to rust-lang-ci/rust that referenced this pull request May 23, 2023
@bors
Auto merge of rust-lang#110519 - loongarch-rs:ci, r=Mark-Simulacrum
cda5bec 
ci: Add support for dist-loongarch64-linux

We are preparing to promote loongarch64-unknown-linux-gnu to Tier 2, and one of the tasks is to add CI support. We are currently in the process of upgrading the dependencies for the build tools, and before this is completed, we would like to request comments. Thanks

#### Progress

- [x] Update linux-raw-sys to 0.3.2 (rust-lang/cargo#11998)
- [x] Update openssl-src to 111.25.3+1.1.1t (rust-lang/cargo#12005)
- [x] bootstrap: Update linux-raw-sys to 0.3.2 (rust-lang#110516)
- [x] Update linux-raw-sys to 0.3.4 (rust-lang#110518)
- [x] Update cargo (rust-lang#110834)
- [x] linux_like: Add missing constants for loongarch64 (rust-lang/libc#3237)
- [x] Release 0.2.143 (rust-lang/libc#3236)
- [x] Update libc to 0.2.144 (rust-lang/cargo#12098)
- [x] Update cargo (rust-lang#111456)

Tier 2 with host tools MCP: rust-lang/compiler-team#518
saethlin pushed a commit to saethlin/miri that referenced this pull request May 26, 2023
@bors
Auto merge of #110519 - loongarch-rs:ci, r=Mark-Simulacrum
be135cd 
ci: Add support for dist-loongarch64-linux

We are preparing to promote loongarch64-unknown-linux-gnu to Tier 2, and one of the tasks is to add CI support. We are currently in the process of upgrading the dependencies for the build tools, and before this is completed, we would like to request comments. Thanks

#### Progress

- [x] Update linux-raw-sys to 0.3.2 (rust-lang/cargo#11998)
- [x] Update openssl-src to 111.25.3+1.1.1t (rust-lang/cargo#12005)
- [x] bootstrap: Update linux-raw-sys to 0.3.2 (rust-lang/rust#110516)
- [x] Update linux-raw-sys to 0.3.4 (rust-lang/rust#110518)
- [x] Update cargo (rust-lang/rust#110834)
- [x] linux_like: Add missing constants for loongarch64 (rust-lang/libc#3237)
- [x] Release 0.2.143 (rust-lang/libc#3236)
- [x] Update libc to 0.2.144 (rust-lang/cargo#12098)
- [x] Update cargo (rust-lang/rust#111456)

Tier 2 with host tools MCP: rust-lang/compiler-team#518
@ehuss ehuss added this to the 1.71.0 milestone May 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@weihanglo weihanglo weihanglo approved these changes

Assignees

@weihanglo weihanglo

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.71.0
Development

Successfully merging this pull request may close these issues.
5 participants
@heiher @rustbot @weihanglo @bors @ehuss