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> References: <202302021349.312DnVFC091823@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000008e7b3605f3c72423 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 =C3=A0(s= ) 13:49: > The branch 2023Q1 has been updated by pkubaj: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3De01ae2321ae356437053e3f18ace8= aa3ff46d344 > > 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 =3D "powerpc64")] { > + mod powerpc64; > + pub use self::powerpc64::*; > ++ } else if #[cfg(target_arch =3D "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 =3D u8; > ++pub type c_long =3D i32; > ++pub type c_ulong =3D u32; > ++pub type wchar_t =3D i32; > ++pub type time_t =3D i64; > ++pub type suseconds_t =3D i32; > ++pub type register_t =3D 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 =3D ::mem::size_of::<::c_int>() - = 1; > ++ } else { > ++ #[doc(hidden)] > ++ pub const _ALIGNBYTES: usize =3D 4 - 1; > ++ } > ++} > ++ > ++pub const MAP_32BIT: ::c_int =3D 0x00080000; > ++pub const MINSIGSTKSZ: ::size_t =3D 2048; // 512 * 4 > --=20 Nuno Teixeira FreeBSD Committer (ports) --0000000000008e7b3605f3c72423 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"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 shou= ldn't PORTREVISION be bumped?</div><div><br></div><div>Cheers, <br></di= v></div><br><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr= ">Piotr Kubaj <<a href=3D"mailto:pkubaj@freebsd.org">pkubaj@freebsd.org<= /a>> escreveu no dia quinta, 2/02/2023 =C3=A0(s) 13:49:<br></div><blockq= uote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1p= x solid rgb(204,204,204);padding-left:1ex">The branch 2023Q1 has been updat= ed by pkubaj:<br> <br> URL: <a href=3D"https://cgit.FreeBSD.org/ports/commit/?id=3De01ae2321ae3564= 37053e3f18ace8aa3ff46d344" rel=3D"noreferrer" target=3D"_blank">https://cgi= t.FreeBSD.org/ports/commit/?id=3De01ae2321ae356437053e3f18ace8aa3ff46d344</= a><br> <br> commit e01ae2321ae356437053e3f18ace8aa3ff46d344<br> Author:=C2=A0 =C2=A0 =C2=A0Piotr Kubaj <pkubaj@FreeBSD.org><br> AuthorDate: 2023-02-02 13:46:02 +0000<br> Commit:=C2=A0 =C2=A0 =C2=A0Piotr Kubaj <pkubaj@FreeBSD.org><br> CommitDate: 2023-02-02 13:48:36 +0000<br> <br> =C2=A0 =C2=A0 editors/amp: fix build on powerpc<br> <br> =C2=A0 =C2=A0 (cherry picked from commit 19ca79a76acec400a96d8dd3dd14fdc8aa= ad35d0)<br> ---<br> =C2=A0editors/amp/files/patch-powerpc | 62 ++++++++++++++++++++++++++++++++= +++++++++<br> =C2=A01 file changed, 62 insertions(+)<br> <br> diff --git a/editors/amp/files/patch-powerpc b/editors/amp/files/patch-powe= rpc<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= =C2=A0 =C2=A0 =C2=A0 2020-03-17 20:35:43 UTC<br> ++++ cargo-crates/libc-0.2.62/src/unix/bsd/freebsdlike/freebsd/<a href=3D"h= ttp://mod.rs" rel=3D"noreferrer" target=3D"_blank">mod.rs</a><br> +@@ -1486,6 +1486,9 @@ cfg_if! {<br> +=C2=A0 =C2=A0 =C2=A0} else if #[cfg(target_arch =3D "powerpc64")= ] {<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mod powerpc64;<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pub use self::powerpc64::*;<br> ++=C2=A0 =C2=A0 } else if #[cfg(target_arch =3D "powerpc")] {<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 mod powerpc;<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub use self::powerpc::*;<br> +=C2=A0 =C2=A0 =C2=A0} else {<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0// Unknown target_arch<br> +=C2=A0 =C2=A0 =C2=A0}<br> +--- cargo-crates/libc-0.2.62/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.o= rig=C2=A0 2021-06-23 22:40:24 UTC<br> ++++ cargo-crates/libc-0.2.62/src/unix/bsd/freebsdlike/freebsd/<a href=3D"h= ttp://powerpc.rs" rel=3D"noreferrer" target=3D"_blank">powerpc.rs</a><br> +@@ -0,0 +1,47 @@<br> ++pub type c_char =3D u8;<br> ++pub type c_long =3D i32;<br> ++pub type c_ulong =3D u32;<br> ++pub type wchar_t =3D i32;<br> ++pub type time_t =3D i64;<br> ++pub type suseconds_t =3D i32;<br> ++pub type register_t =3D i32;<br> ++<br> ++s! {<br> ++=C2=A0 =C2=A0 pub struct stat {<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_dev: ::dev_t,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_ino: ::ino_t,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_mode: ::mode_t,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_nlink: ::nlink_t,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_uid: ::uid_t,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_gid: ::gid_t,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_rdev: ::dev_t,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_atime: ::time_t,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_atime_nsec: ::c_long,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_mtime: ::time_t,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_mtime_nsec: ::c_long,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_ctime: ::time_t,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_ctime_nsec: ::c_long,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_size: ::off_t,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_blocks: ::blkcnt_t,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_blksize: ::blksize_t,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_flags: ::fflags_t,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_gen: u32,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_lspare: i32,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_birthtime: ::time_t,<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_birthtime_nsec: ::c_long,<br> ++=C2=A0 =C2=A0 }<br> ++}<br> ++<br> ++// should be pub(crate), but that requires Rust 1.18.0<br> ++cfg_if! {<br> ++=C2=A0 =C2=A0 if #[cfg(libc_const_size_of)] {<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 #[doc(hidden)]<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub const _ALIGNBYTES: usize =3D ::mem::size_= of::<::c_int>() - 1;<br> ++=C2=A0 =C2=A0 } else {<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 #[doc(hidden)]<br> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub const _ALIGNBYTES: usize =3D 4 - 1;<br> ++=C2=A0 =C2=A0 }<br> ++}<br> ++<br> ++pub const MAP_32BIT: ::c_int =3D 0x00080000;<br> ++pub const MINSIGSTKSZ: ::size_t =3D 2048; // 512 * 4<br> </blockquote></div><br clear=3D"all"><br>-- <br><div dir=3D"ltr" class=3D"g= mail_signature"><div dir=3D"ltr"><span style=3D"color:rgb(102,102,102)">Nun= o Teixeira<br>FreeBSD Committer (ports)</span></div></div> --0000000000008e7b3605f3c72423--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7UJpEAze7JOyqXYLZS7MHyB3y6%2BD1SXq5NrKCDnWbOoO6g>