diff options
| author | Samuel Holland <samuel@sholland.org> | 2018-10-06 04:22:05 +0000 |
|---|---|---|
| committer | Samuel Holland <samuel@sholland.org> | 2018-10-09 04:28:15 +0000 |
| commit | 2323b0da26e293bb4d5a7a4ad8afed85a599d11d (patch) | |
| tree | d67f5276d8d72c2fe2caa2e4e5756c14848d9f91 /user/rust/0015-flock-Fix-F_SETLK-F_SETLKW-on-32-bit-O_LARGEFILE.patch | |
| parent | 49cec2be42835f6b4c5ff1bad4710e20db422b87 (diff) | |
| download | packages-2323b0da26e293bb4d5a7a4ad8afed85a599d11d.tar.gz packages-2323b0da26e293bb4d5a7a4ad8afed85a599d11d.tar.bz2 packages-2323b0da26e293bb4d5a7a4ad8afed85a599d11d.tar.xz packages-2323b0da26e293bb4d5a7a4ad8afed85a599d11d.zip | |
user/rust: Bump to 1.29.1 plus fixes for i586, ppc32
Diffstat (limited to 'user/rust/0015-flock-Fix-F_SETLK-F_SETLKW-on-32-bit-O_LARGEFILE.patch')
| -rw-r--r-- | user/rust/0015-flock-Fix-F_SETLK-F_SETLKW-on-32-bit-O_LARGEFILE.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/user/rust/0015-flock-Fix-F_SETLK-F_SETLKW-on-32-bit-O_LARGEFILE.patch b/user/rust/0015-flock-Fix-F_SETLK-F_SETLKW-on-32-bit-O_LARGEFILE.patch new file mode 100644 index 000000000..de9661d3a --- /dev/null +++ b/user/rust/0015-flock-Fix-F_SETLK-F_SETLKW-on-32-bit-O_LARGEFILE.patch @@ -0,0 +1,27 @@ +From 9c13dec5a526a4a66dc45453ab1808ab9a1bb10b Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Tue, 9 Oct 2018 04:15:48 +0000 +Subject: [PATCH 15/29] flock: Fix F_SETLK/F_SETLKW on 32-bit O_LARGEFILE + +--- + src/librustc_data_structures/flock.rs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/librustc_data_structures/flock.rs b/src/librustc_data_structures/flock.rs +index ff1ebb11b7..d85017ec50 100644 +--- a/src/librustc_data_structures/flock.rs ++++ b/src/librustc_data_structures/flock.rs +@@ -46,8 +46,8 @@ mod imp { + pub const F_RDLCK: libc::c_short = 0; + pub const F_WRLCK: libc::c_short = 1; + pub const F_UNLCK: libc::c_short = 2; +- pub const F_SETLK: libc::c_int = 6; +- pub const F_SETLKW: libc::c_int = 7; ++ pub const F_SETLK: libc::c_int = libc::F_SETLK; ++ pub const F_SETLKW: libc::c_int = libc::F_SETLKW; + } + + #[cfg(target_os = "freebsd")] +-- +2.18.0 + |