Re: git: e01ae2321ae3 - 2023Q1 - editors/amp: fix build on powerpc

Hello Piotr,

Thanks for the update.

Just one doubt that I have: should or shouldn't PORTREVISION be bumped?

Cheers,

Piotr Kubaj <pkubaj@freebsd.org> escreveu no dia quinta, 2/02/2023 à(s)
13:49:

> The branch 2023Q1 has been updated by pkubaj:
>
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=e01ae2321ae356437053e3f18ace8aa3ff46d344
>
> commit e01ae2321ae356437053e3f18ace8aa3ff46d344
> Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
> AuthorDate: 2023-02-02 13:46:02 +0000
> Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
> CommitDate: 2023-02-02 13:48:36 +0000
>
>     editors/amp: fix build on powerpc
>
>     (cherry picked from commit 19ca79a76acec400a96d8dd3dd14fdc8aaad35d0)
> ---
>  editors/amp/files/patch-powerpc | 62
> +++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 62 insertions(+)
>
> diff --git a/editors/amp/files/patch-powerpc
> b/editors/amp/files/patch-powerpc
> new file mode 100644
> index 000000000000..1b92066ac900
> --- /dev/null
> +++ b/editors/amp/files/patch-powerpc
> @@ -0,0 +1,62 @@
> +---
> cargo-crates/libc-0.2.62/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig
> 2020-03-17 20:35:43 UTC
> ++++ cargo-crates/libc-0.2.62/src/unix/bsd/freebsdlike/freebsd/mod.rs
> +@@ -1486,6 +1486,9 @@ cfg_if! {
> +     } else if #[cfg(target_arch = "powerpc64")] {
> +         mod powerpc64;
> +         pub use self::powerpc64::*;
> ++    } else if #[cfg(target_arch = "powerpc")] {
> ++        mod powerpc;
> ++        pub use self::powerpc::*;
> +     } else {
> +         // Unknown target_arch
> +     }
> +---
> cargo-crates/libc-0.2.62/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.orig
> 2021-06-23 22:40:24 UTC
> ++++ cargo-crates/libc-0.2.62/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
>


-- 
Nuno Teixeira
FreeBSD Committer (ports)