Skip to content

Rust 1.73.0 - #21

Closed
rubdos wants to merge 9 commits into
sailfishos:masterfrom
rubdos:1.73.0
Closed

Rust 1.73.0#21
rubdos wants to merge 9 commits into
sailfishos:masterfrom
rubdos:1.73.0

Conversation

@rubdos

@rubdos rubdos commented Oct 26, 2023

Copy link
Copy Markdown
Contributor
+ /bin/cat /home/rubdos/rpmbuild/SOURCES/0001-Set-proper-llvm-targets.patch
+ /usr/bin/patch -p1 -s --fuzz=0 --no-backup-if-mismatch
+ /bin/cat /home/rubdos/rpmbuild/SOURCES/0002-Disable-statx-for-all-builds.-JB-50106.patch
+ /usr/bin/patch -p1 -s --fuzz=0 --no-backup-if-mismatch
+ /bin/cat /home/rubdos/rpmbuild/SOURCES/0003-Scratchbox2-needs-to-be-able-to-tell-rustc-the-defau.patch
+ /usr/bin/patch -p1 -s --fuzz=0 --no-backup-if-mismatch
+ /bin/cat /home/rubdos/rpmbuild/SOURCES/0004-Force-the-target-when-building-for-CompileKind-Host.patch
+ /usr/bin/patch -p1 -s --fuzz=0 --no-backup-if-mismatch
+ /bin/cat /home/rubdos/rpmbuild/SOURCES/0005-Provide-ENV-controls-to-bypass-some-sb2-calls-betwee.patch
+ /usr/bin/patch -p1 -s --fuzz=0 --no-backup-if-mismatch
2 out of 11 hunks FAILED -- saving rejects to file library/std/src/sys/unix/process/process_unix.rs.rej
error: Bad exit status from /var/tmp/rpm-tmp.923xPE (%prep)

Patches still need another rebase, it seems.

Part of The Rust Plan

@rubdos

rubdos commented Oct 26, 2023

Copy link
Copy Markdown
Contributor Author

A very lazy rebase didn't cut it:

error[E0308]: mismatched types
   --> library/std/src/sys/unix/process/process_unix.rs:177:30
    |
177 |             self.unwrap_drop(input);
    |                  ----------- ^^^^^ expected `AnonPipe`, found `Socket`
    |                  |
    |                  arguments to this method are incorrect
    |
note: method defined here
   --> library/std/src/sys/unix/process/process_unix.rs:334:8
    |
334 |     fn unwrap_drop(&mut self, fh: sys::unix::pipe::AnonPipe) {
    |        ^^^^^^^^^^^            -----------------------------

For more information about this error, try `rustc --explain E0308`.

@rubdos rubdos mentioned this pull request Dec 29, 2023
@rubdos

rubdos commented Dec 29, 2023

Copy link
Copy Markdown
Contributor Author

Looks like with c9fd237, this compiles.

@rubdos
rubdos marked this pull request as ready for review December 29, 2023 12:55
@rubdos rubdos closed this Mar 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants