Backported build fixes

Former-commit-id: ae09deff35f009bd4d5d479ad1a4005acb56557e

util/src/snappy.rs

@@ -23,7 +23,7 @@ const SNAPPY_OK: c_int = 0;
 const SNAPPY_INVALID_INPUT: c_int = 1;
 const SNAPPY_BUFFER_TOO_SMALL: c_int = 2;
 
-#[link(name = "snappy")]
+#[link(name = "snappy", kind = "static")]
 extern {
 	fn snappy_compress(
 		input: *const c_char,
@@ -154,4 +154,4 @@ pub fn decompress_into(input: &[u8], output: &mut Vec<u8>) -> Result<usize, Inva
 pub fn validate_compressed_buffer(input: &[u8]) -> bool {
 	let status = unsafe { snappy_validate_compressed_buffer(input.as_ptr() as *const c_char, input.len() as size_t )};
 	status == SNAPPY_OK
-}
+}