git: d34590035d66 - main - security/weggli: fix build on powerpc

From: Piotr Kubaj <pkubaj_at_FreeBSD.org>
Date: Sat, 02 Apr 2022 20:43:06 UTC
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d34590035d66eb10742d3b338b928e5c7c460823

commit d34590035d66eb10742d3b338b928e5c7c460823
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2022-04-02 20:31:16 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2022-04-02 20:31:16 +0000

    security/weggli: fix build on powerpc
    
    libc patch is upstreamed, but crossbeam-{epoch,utils} is used in older version that requires patching.
---
 security/weggli/files/patch-powerpc | 70 +++++++++++--------------------------
 1 file changed, 20 insertions(+), 50 deletions(-)

diff --git a/security/weggli/files/patch-powerpc b/security/weggli/files/patch-powerpc
index 819f907bb705..0f536b57abf4 100644
--- a/security/weggli/files/patch-powerpc
+++ b/security/weggli/files/patch-powerpc
@@ -1,50 +1,20 @@
---- cargo-crates/libc-0.2.107/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.orig	2021-06-23 22:40:24 UTC
-+++ cargo-crates/libc-0.2.107/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
-@@ -0,0 +1,47 @@
-+pub type c_char = u8;
-+pub type c_long = i32;
-+pub type c_ulong = u32;
-+pub type wchar_t = i32;
-+pub type time_t = i64;
-+pub type suseconds_t = i32;
-+pub type register_t = i32;
-+
-+s! {
-+    pub struct stat {
-+        pub st_dev: ::dev_t,
-+        pub st_ino: ::ino_t,
-+        pub st_mode: ::mode_t,
-+        pub st_nlink: ::nlink_t,
-+        pub st_uid: ::uid_t,
-+        pub st_gid: ::gid_t,
-+        pub st_rdev: ::dev_t,
-+        pub st_atime: ::time_t,
-+        pub st_atime_nsec: ::c_long,
-+        pub st_mtime: ::time_t,
-+        pub st_mtime_nsec: ::c_long,
-+        pub st_ctime: ::time_t,
-+        pub st_ctime_nsec: ::c_long,
-+        pub st_size: ::off_t,
-+        pub st_blocks: ::blkcnt_t,
-+        pub st_blksize: ::blksize_t,
-+        pub st_flags: ::fflags_t,
-+        pub st_gen: u32,
-+        pub st_lspare: i32,
-+        pub st_birthtime: ::time_t,
-+        pub st_birthtime_nsec: ::c_long,
-+    }
-+}
-+
-+// should be pub(crate), but that requires Rust 1.18.0
-+cfg_if! {
-+    if #[cfg(libc_const_size_of)] {
-+        #[doc(hidden)]
-+        pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1;
-+    } else {
-+        #[doc(hidden)]
-+        pub const _ALIGNBYTES: usize = 4 - 1;
-+    }
-+}
-+
-+pub const MAP_32BIT: ::c_int = 0x00080000;
-+pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4
+--- cargo-crates/crossbeam-epoch-0.9.5/no_atomic.rs.orig	2021-07-12 16:01:21.814570000 +0200
++++ cargo-crates/crossbeam-epoch-0.9.5/no_atomic.rs	2021-07-12 16:01:34.083879000 +0200
+@@ -30,6 +30,7 @@
+     "mipsel-unknown-none",
+     "mipsisa32r6-unknown-linux-gnu",
+     "mipsisa32r6el-unknown-linux-gnu",
++    "powerpc-unknown-freebsd",
+     "powerpc-unknown-linux-gnu",
+     "powerpc-unknown-linux-gnuspe",
+     "powerpc-unknown-linux-musl",
+--- cargo-crates/crossbeam-utils-0.8.5/no_atomic.rs.orig	2021-07-12 16:01:05.023177000 +0200
++++ cargo-crates/crossbeam-utils-0.8.5/no_atomic.rs	2021-07-12 16:01:16.538869000 +0200
+@@ -30,6 +30,7 @@
+     "mipsel-unknown-none",
+     "mipsisa32r6-unknown-linux-gnu",
+     "mipsisa32r6el-unknown-linux-gnu",
++    "powerpc-unknown-freebsd",
+     "powerpc-unknown-linux-gnu",
+     "powerpc-unknown-linux-gnuspe",
+     "powerpc-unknown-linux-musl",