Date: Fri, 3 Feb 2023 08:05:09 +0000 From: Nuno Teixeira <eduardo@freebsd.org> To: Piotr Kubaj <pkubaj@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org Subject: Re: git: e01ae2321ae3 - 2023Q1 - editors/amp: fix build on powerpc Message-ID: <CAFDf7UJpEAze7JOyqXYLZS7MHyB3y6%2BD1SXq5NrKCDnWbOoO6g@mail.gmail.com> In-Reply-To: <202302021349.312DnVFC091823@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] 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) [-- Attachment #2 --] <div dir="ltr"><div>Hello Piotr,</div><div><br></div><div>Thanks for the update.</div><div><br></div><div>Just one doubt that I have: should or shouldn't PORTREVISION be bumped?</div><div><br></div><div>Cheers, <br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Piotr Kubaj <<a href="mailto:pkubaj@freebsd.org">pkubaj@freebsd.org</a>> escreveu no dia quinta, 2/02/2023 à(s) 13:49:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch 2023Q1 has been updated by pkubaj:<br> <br> URL: <a href="https://cgit.FreeBSD.org/ports/commit/?id=e01ae2321ae356437053e3f18ace8aa3ff46d344" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=e01ae2321ae356437053e3f18ace8aa3ff46d344</a><br>; <br> commit e01ae2321ae356437053e3f18ace8aa3ff46d344<br> Author: Piotr Kubaj <pkubaj@FreeBSD.org><br> AuthorDate: 2023-02-02 13:46:02 +0000<br> Commit: Piotr Kubaj <pkubaj@FreeBSD.org><br> CommitDate: 2023-02-02 13:48:36 +0000<br> <br> editors/amp: fix build on powerpc<br> <br> (cherry picked from commit 19ca79a76acec400a96d8dd3dd14fdc8aaad35d0)<br> ---<br> editors/amp/files/patch-powerpc | 62 +++++++++++++++++++++++++++++++++++++++++<br> 1 file changed, 62 insertions(+)<br> <br> diff --git a/editors/amp/files/patch-powerpc b/editors/amp/files/patch-powerpc<br> new file mode 100644<br> index 000000000000..1b92066ac900<br> --- /dev/null<br> +++ b/editors/amp/files/patch-powerpc<br> @@ -0,0 +1,62 @@<br> +--- cargo-crates/libc-0.2.62/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2020-03-17 20:35:43 UTC<br> ++++ cargo-crates/libc-0.2.62/src/unix/bsd/freebsdlike/freebsd/<a href="http://mod.rs" rel="noreferrer" target="_blank">mod.rs</a><br> +@@ -1486,6 +1486,9 @@ cfg_if! {<br> + } else if #[cfg(target_arch = "powerpc64")] {<br> + mod powerpc64;<br> + pub use self::powerpc64::*;<br> ++ } else if #[cfg(target_arch = "powerpc")] {<br> ++ mod powerpc;<br> ++ pub use self::powerpc::*;<br> + } else {<br> + // Unknown target_arch<br> + }<br> +--- cargo-crates/libc-0.2.62/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.orig 2021-06-23 22:40:24 UTC<br> ++++ cargo-crates/libc-0.2.62/src/unix/bsd/freebsdlike/freebsd/<a href="http://powerpc.rs" rel="noreferrer" target="_blank">powerpc.rs</a><br> +@@ -0,0 +1,47 @@<br> ++pub type c_char = u8;<br> ++pub type c_long = i32;<br> ++pub type c_ulong = u32;<br> ++pub type wchar_t = i32;<br> ++pub type time_t = i64;<br> ++pub type suseconds_t = i32;<br> ++pub type register_t = i32;<br> ++<br> ++s! {<br> ++ pub struct stat {<br> ++ pub st_dev: ::dev_t,<br> ++ pub st_ino: ::ino_t,<br> ++ pub st_mode: ::mode_t,<br> ++ pub st_nlink: ::nlink_t,<br> ++ pub st_uid: ::uid_t,<br> ++ pub st_gid: ::gid_t,<br> ++ pub st_rdev: ::dev_t,<br> ++ pub st_atime: ::time_t,<br> ++ pub st_atime_nsec: ::c_long,<br> ++ pub st_mtime: ::time_t,<br> ++ pub st_mtime_nsec: ::c_long,<br> ++ pub st_ctime: ::time_t,<br> ++ pub st_ctime_nsec: ::c_long,<br> ++ pub st_size: ::off_t,<br> ++ pub st_blocks: ::blkcnt_t,<br> ++ pub st_blksize: ::blksize_t,<br> ++ pub st_flags: ::fflags_t,<br> ++ pub st_gen: u32,<br> ++ pub st_lspare: i32,<br> ++ pub st_birthtime: ::time_t,<br> ++ pub st_birthtime_nsec: ::c_long,<br> ++ }<br> ++}<br> ++<br> ++// should be pub(crate), but that requires Rust 1.18.0<br> ++cfg_if! {<br> ++ if #[cfg(libc_const_size_of)] {<br> ++ #[doc(hidden)]<br> ++ pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1;<br> ++ } else {<br> ++ #[doc(hidden)]<br> ++ pub const _ALIGNBYTES: usize = 4 - 1;<br> ++ }<br> ++}<br> ++<br> ++pub const MAP_32BIT: ::c_int = 0x00080000;<br> ++pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4<br> </blockquote></div><br clear="all"><br>-- <br><div dir="ltr" class="gmail_signature"><div dir="ltr"><span style="color:rgb(102,102,102)">Nuno Teixeira<br>FreeBSD Committer (ports)</span></div></div>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7UJpEAze7JOyqXYLZS7MHyB3y6%2BD1SXq5NrKCDnWbOoO6g>