Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
WIP: Add mozilla-bmo1618776.patch to fix build on s390x for mozilla-c…
…entral
- Loading branch information
Martin Sirringhaus
committed
Feb 28, 2020
1 parent
3ec18af
commit c694b93
Showing
1 changed file
with
54 additions
and
0 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
diff -r f5c68128585c Cargo.lock | ||
--- a/Cargo.lock Fri Feb 28 12:31:51 2020 +0100 | ||
+++ b/Cargo.lock Fri Feb 28 12:33:15 2020 +0100 | ||
@@ -175,8 +175,6 @@ | ||
[[package]] | ||
name = "authenticator" | ||
version = "0.2.9" | ||
-source = "registry+https://github.com/rust-lang/crates.io-index" | ||
-checksum = "c9b93efb62fd39d28cf78aa7ae459dc312f39c287086ae7a5c379e1bf075a9ad" | ||
dependencies = [ | ||
"bitflags", | ||
"boxfnonce", | ||
diff -r f5c68128585c Cargo.toml | ||
--- a/Cargo.toml Fri Feb 28 12:31:51 2020 +0100 | ||
+++ b/Cargo.toml Fri Feb 28 12:33:15 2020 +0100 | ||
@@ -69,6 +69,7 @@ | ||
# failure's backtrace feature might break our builds, see bug 1608157. | ||
failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } | ||
failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } | ||
+authenticator = { path = './third_party/rust/authenticator' } | ||
|
||
[patch.crates-io.cranelift-codegen] | ||
git = "https://github.com/bytecodealliance/cranelift" | ||
diff -r f5c68128585c third_party/rust/authenticator/build.rs | ||
--- a/third_party/rust/authenticator/build.rs Fri Feb 28 12:31:51 2020 +0100 | ||
+++ b/third_party/rust/authenticator/build.rs Fri Feb 28 12:33:15 2020 +0100 | ||
@@ -41,6 +41,8 @@ | ||
"ioctl_aarch64le.rs" | ||
} else if cfg!(all(target_arch = "aarch64", target_endian = "big")) { | ||
"ioctl_aarch64be.rs" | ||
+ } else if cfg!(all(target_arch = "s390x", target_endian = "big")) { | ||
+ "ioctl_s390xbe.rs" | ||
} else { | ||
panic!("architecture not supported"); | ||
}; | ||
diff -r f5c68128585c third_party/rust/authenticator/src/linux/hidwrapper.rs | ||
--- a/third_party/rust/authenticator/src/linux/hidwrapper.rs Fri Feb 28 12:31:51 2020 +0100 | ||
+++ b/third_party/rust/authenticator/src/linux/hidwrapper.rs Fri Feb 28 12:33:15 2020 +0100 | ||
@@ -40,3 +40,6 @@ | ||
|
||
#[cfg(all(target_arch = "aarch64", target_endian = "big"))] | ||
include!("ioctl_aarch64be.rs"); | ||
+ | ||
+#[cfg(all(target_arch = "s390x", target_endian = "big"))] | ||
+include!("ioctl_s390xbe.rs"); | ||
diff -r f5c68128585c third_party/rust/authenticator/src/linux/ioctl_s390xbe.rs | ||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||
+++ b/third_party/rust/authenticator/src/linux/ioctl_s390xbe.rs Fri Feb 28 12:33:15 2020 +0100 | ||
@@ -0,0 +1,5 @@ | ||
+/* automatically generated by rust-bindgen */ | ||
+ | ||
+pub type __u32 = ::std::os::raw::c_uint; | ||
+pub const _HIDIOCGRDESCSIZE: __u32 = 2147764225; | ||
+pub const _HIDIOCGRDESC: __u32 = 2416199682; |