Fix compilation error on Solaris due to flock usage #132977
Merged
+108
−0
Conversation
This file contains 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
rustbot
added
O-unix
|
I can confirm I can build Rust with these two commits on Solaris. (I just wonder if there is any implication not implementing this feature...) |
PR 130999 added the file_lock feature, but libc does not define flock() for the Solaris platform leading to a compilation error. Additionally, I went through all the Tier 2 platforms and read through their documentation to see whether flock was implemented. This turned up 5 more Unix platforms where flock is not supported, even though it may exist in the libc crate.
yep, done.
I believe it's fine. This is a new unstable feature, and in the ACP it was decided that OSs without support should return ErrorKind::Unsupported |
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 15, 2024
…kingjubilee Rollup of 8 pull requests Successful merges: - rust-lang#132790 (Add as_slice/into_slice for IoSlice/IoSliceMut.) - rust-lang#132905 ([AIX] Add crate "unwind" to link with libunwind) - rust-lang#132977 (Fix compilation error on Solaris due to flock usage) - rust-lang#132984 ([illumos] use pipe2 to create anonymous pipes) - rust-lang#133019 (docs: Fix missing period and colon in methods for primitive types) - rust-lang#133048 (use `&raw` in `{read, write}_unaligned` documentation) - rust-lang#133050 (Always inline functions signatures containing `f16` or `f128`) - rust-lang#133053 (tests: Fix the SIMD FFI tests with certain x86 configuration) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 15, 2024
Rollup merge of rust-lang#132977 - cberner:fix_solaris, r=tgross35 Fix compilation error on Solaris due to flock usage PR 130999 added the file_lock feature, but libc does not define flock() for the Solaris platform leading to a compilation error. Additionally, I went through all the Tier 2 platforms and read through their documentation to see whether flock was implemented. This turned up 5 more Unix platforms where flock is not supported, even though it may exist in the libc crate. Fixes rust-lang#132921 Related to rust-lang#130999
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR 130999 added the file_lock feature, but libc does not define flock() for the Solaris platform leading to a compilation error.
Additionally, I went through all the Tier 2 platforms and read through their documentation to see whether flock was implemented. This turned up 5 more Unix platforms where flock is not supported, even though it may exist in the libc crate.
Fixes #132921
Related to #130999