Codebase list rust-libslirp / 781daa0
Fix build of zmq-sys on 32bit architectures Jan Niehusmann 3 years ago
4 changed file(s) with 79 addition(s) and 33 deletion(s). Raw diff Collapse all Expand all
0 rust-zmq-sys (0.11.0-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
1
2 * Fix build on 32bit architectures
3
4 -- Jan Niehusmann <jan@debian.org> Tue, 24 Nov 2020 17:48:38 +0100
5
06 rust-zmq-sys (0.11.0-1) unstable; urgency=medium
17
28 * Package zmq-sys 0.11.0 from crates.io using debcargo 2.4.2
0 Index: rust-zmq-sys-0.11.0/src/ffi.rs
1 ===================================================================
2 --- rust-zmq-sys-0.11.0.orig/src/ffi.rs
3 +++ rust-zmq-sys-0.11.0/src/ffi.rs
4 @@ -415,6 +415,7 @@ pub struct zmq_pollitem_t {
5 pub revents: ::std::os::raw::c_short,
6 }
7 #[test]
8 +#[cfg(target_pointer_width = "64")]
9 fn bindgen_test_layout_zmq_pollitem_t() {
10 assert_eq!(
11 ::std::mem::size_of::<zmq_pollitem_t>(),
12 @@ -462,6 +463,59 @@ fn bindgen_test_layout_zmq_pollitem_t()
13 concat!(
14 "Offset of field: ",
15 stringify!(zmq_pollitem_t),
16 + "::",
17 + stringify!(revents)
18 + )
19 + );
20 +}
21 +#[cfg(not(target_pointer_width = "64"))]
22 +fn bindgen_test_layout_zmq_pollitem_t() {
23 + assert_eq!(
24 + ::std::mem::size_of::<zmq_pollitem_t>(),
25 + 12usize,
26 + concat!("Size of: ", stringify!(zmq_pollitem_t))
27 + );
28 + assert_eq!(
29 + ::std::mem::align_of::<zmq_pollitem_t>(),
30 + 4usize,
31 + concat!("Alignment of ", stringify!(zmq_pollitem_t))
32 + );
33 + assert_eq!(
34 + unsafe { &(*(::std::ptr::null::<zmq_pollitem_t>())).socket as *const _ as usize },
35 + 0usize,
36 + concat!(
37 + "Offset of field: ",
38 + stringify!(zmq_pollitem_t),
39 + "::",
40 + stringify!(socket)
41 + )
42 + );
43 + assert_eq!(
44 + unsafe { &(*(::std::ptr::null::<zmq_pollitem_t>())).fd as *const _ as usize },
45 + 4usize,
46 + concat!(
47 + "Offset of field: ",
48 + stringify!(zmq_pollitem_t),
49 + "::",
50 + stringify!(fd)
51 + )
52 + );
53 + assert_eq!(
54 + unsafe { &(*(::std::ptr::null::<zmq_pollitem_t>())).events as *const _ as usize },
55 + 8usize,
56 + concat!(
57 + "Offset of field: ",
58 + stringify!(zmq_pollitem_t),
59 + "::",
60 + stringify!(events)
61 + )
62 + );
63 + assert_eq!(
64 + unsafe { &(*(::std::ptr::null::<zmq_pollitem_t>())).revents as *const _ as usize },
65 + 10usize,
66 + concat!(
67 + "Offset of field: ",
68 + stringify!(zmq_pollitem_t),
69 "::",
70 stringify!(revents)
71 )
+0
-33
src/zmq-sys/debian/patches/remove-metadeps-dep.diff~ less more
0 Index: zmq-sys/Cargo.toml
1 ===================================================================
2 --- zmq-sys.orig/Cargo.toml
3 +++ zmq-sys/Cargo.toml
4 @@ -25,8 +25,8 @@ repository = "https://github.com/erickt/
5 libzmq = "4.1"
6 [dependencies.libc]
7 version = "0.2.15"
8 -[build-dependencies.metadeps]
9 -version = "1"
10 +#[build-dependencies.metadeps]
11 +#version = "1"
12
13 [build-dependencies.zeromq-src]
14 version = "0.1.7"
15 Index: zmq-sys/build/pkg_config.rs
16 ===================================================================
17 --- zmq-sys.orig/build/pkg_config.rs
18 +++ zmq-sys/build/pkg_config.rs
19 @@ -22,9 +22,10 @@ pub fn configure() {
20 (Some(_), None) => panic!("Unable to locate libzmq include directory."),
21 (None, Some(_)) => panic!("Unable to locate libzmq library directory."),
22 (None, None) => {
23 - if let Err(e) = metadeps::probe() {
24 - panic!("Unable to locate libzmq:\n{}", e);
25 - }
26 + pkg_config::Config::new().atleast_version("4.1").probe("libzmq").unwrap();
27 + //if let Err(e) = metadeps::probe() {
28 + // panic!("Unable to locate libzmq:\n{}", e);
29 + //}
30 }
31 }
32 }
00 remove-metadeps-dep.diff
11 no-vendoring.diff
2 fix-32bit-build.diff