From nobody Fri Feb 03 08:05:09 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P7SrK5bzDz2nKXZ; Fri, 3 Feb 2023 08:05:21 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P7SrK58Cbz4Y3l; Fri, 3 Feb 2023 08:05:21 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675411521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Q49mrRiLBu/IqMO2L/+jXZofOimBQodv5l4XIAF0Ajo=; b=csKUqcBxIHNtvVHxwGmQBtHsihrLCkYGa2pvpbWFWd8kCW8ikmOK+fppDhSQs+p7RfKezl rIW0eoMXc3XLk8YFkUa48RnZFu+c1rSx8rxAmBjamxrTG9MCvvHXehe/3hsLO2Uf1aCnXs WZl0VTS3XQw5Wm5OEfkzzZPIcm4d/QgLCLR5/61WuOb4+TlBEIuNhqLFHWqfTndrzz8cVv E7HVIpfJSy0p/K7QAtboa8vI2TjwyX49XYCedEwsYtleFE88PLMWZAf8R2fyMaAftuoFOf MNOGXI3VvJBf5n1y+9KzoBqumtV3KxWyXz36cN0RlSzJISX2AI5RLJxIYhnfsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675411521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Q49mrRiLBu/IqMO2L/+jXZofOimBQodv5l4XIAF0Ajo=; b=Afkyz5yUxQS5Kz8lP2LBQuzBk2Bc8QFZcU7JPZrhF672H7nCIkWDBAvQaAXisN+7UPFLgf fo3NzFHkfH5KcSJzgDrEH0SfIsaMAoO1umWbyiIqiW+iFbG5Ux5kybnN8o9RYBolaY/9zH HHBXYsYNkTl+zrHYMjiWUA+BAL2bzPyTXMAi8V7/x8MRumEUu04JtePSQckyC1CR5eUtXs 8sqEF+PRWydtjaRdUGEm4kPbmU3Dgi/shy11mTLlndOlEE/Wv+5khd4mm5jeKcv3lvqnC2 dUiVZJWhxyht7PRNCcpv6k3zolNcUB+stBtKRaaUS42rcZxpXv24VV1Tjr+RKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675411521; a=rsa-sha256; cv=none; b=QbTUgBIXfA0pEEGT2x1AsTrjSqBErM1VMOLI9vapijbczkEfNT7UU0EiIwDrsTQ1ZI7xmI kG68l+CvDhKn4JLy3VuFlCZQLLu9sgUAHsGub+NNjZFcva6KzI7n2M9vmeNojRIl+GbAiF /MhaM/4DT6IVzJCL3pTHfe9qjWHdwGA7ccloeFZQ051ze3DNZ/OJHUZp4VS87LHyJ+iqOL WEA/OgAXs1Try5v7XKwxTUq5Li/Gd/KBmmG5U9GZF8fbZTOaYgo5jOn5QVA2V9xNlT7gju cEDvCFwtNjCSmmDOioRsc/WkLCJQVFgUhEz3yy7pJ9I1QiV2+PApQE8qRX+gQg== Received: from mail-vk1-f178.google.com (mail-vk1-f178.google.com [209.85.221.178]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4P7SrK45PQzss2; Fri, 3 Feb 2023 08:05:21 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-vk1-f178.google.com with SMTP id v81so2186000vkv.5; Fri, 03 Feb 2023 00:05:21 -0800 (PST) X-Gm-Message-State: AO0yUKVWrWVP2SGOcZztO/bv+gtme8DUX81ZsHJNmwm2EL+v3P6z8W2o mHlzLL9Yz5XDIIh97iqbhUbH9WNMzKR4dz33QSM= X-Google-Smtp-Source: AK7set+xdBb14+Jsb7wJwMPDVhyX6ys0P1fpOe6mQvxq68t3VpAruJ5i3t0UPEqi4SqoyEtCf+NsWF0Y6Fypx7wIaSs= X-Received: by 2002:a1f:5e49:0:b0:3ea:28f0:b684 with SMTP id s70-20020a1f5e49000000b003ea28f0b684mr1342159vkb.5.1675411520910; Fri, 03 Feb 2023 00:05:20 -0800 (PST) List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 References: <202302021349.312DnVFC091823@gitrepo.freebsd.org> In-Reply-To: <202302021349.312DnVFC091823@gitrepo.freebsd.org> From: Nuno Teixeira Date: Fri, 3 Feb 2023 08:05:09 +0000 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: e01ae2321ae3 - 2023Q1 - editors/amp: fix build on powerpc To: Piotr Kubaj Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org Content-Type: multipart/alternative; boundary="0000000000008e7b3605f3c72423" X-ThisMailContainsUnwantedMimeParts: N --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 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 > AuthorDate: 2023-02-02 13:46:02 +0000 > Commit: Piotr Kubaj > 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
Hello Piotr,

Thanks for the = update.

Just one doubt that I have: should or shou= ldn't PORTREVISION be bumped?

Cheers,

Piotr Kubaj <pkubaj@freebsd.org<= /a>> escreveu no dia quinta, 2/02/2023 =C3=A0(s) 13:49:
The branch 2023Q1 has been updat= ed by pkubaj:

URL: https://cgi= t.FreeBSD.org/ports/commit/?id=3De01ae2321ae356437053e3f18ace8aa3ff46d344

commit e01ae2321ae356437053e3f18ace8aa3ff46d344
Author:=C2=A0 =C2=A0 =C2=A0Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-02-02 13:46:02 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-02-02 13:48:36 +0000

=C2=A0 =C2=A0 editors/amp: fix build on powerpc

=C2=A0 =C2=A0 (cherry picked from commit 19ca79a76acec400a96d8dd3dd14fdc8aa= ad35d0)
---
=C2=A0editors/amp/files/patch-powerpc | 62 ++++++++++++++++++++++++++++++++= +++++++++
=C2=A01 file changed, 62 insertions(+)

diff --git a/editors/amp/files/patch-powerpc b/editors/amp/files/patch-powe= rpc
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= =C2=A0 =C2=A0 =C2=A0 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! {
+=C2=A0 =C2=A0 =C2=A0} else if #[cfg(target_arch =3D "powerpc64")= ] {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mod powerpc64;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pub use self::powerpc64::*;
++=C2=A0 =C2=A0 } else if #[cfg(target_arch =3D "powerpc")] {
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 mod powerpc;
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub use self::powerpc::*;
+=C2=A0 =C2=A0 =C2=A0} else {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0// Unknown target_arch
+=C2=A0 =C2=A0 =C2=A0}
+--- cargo-crates/libc-0.2.62/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.o= rig=C2=A0 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! {
++=C2=A0 =C2=A0 pub struct stat {
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_dev: ::dev_t,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_ino: ::ino_t,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_mode: ::mode_t,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_nlink: ::nlink_t,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_uid: ::uid_t,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_gid: ::gid_t,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_rdev: ::dev_t,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_atime: ::time_t,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_atime_nsec: ::c_long,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_mtime: ::time_t,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_mtime_nsec: ::c_long,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_ctime: ::time_t,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_ctime_nsec: ::c_long,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_size: ::off_t,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_blocks: ::blkcnt_t,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_blksize: ::blksize_t,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_flags: ::fflags_t,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_gen: u32,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_lspare: i32,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_birthtime: ::time_t,
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub st_birthtime_nsec: ::c_long,
++=C2=A0 =C2=A0 }
++}
++
++// should be pub(crate), but that requires Rust 1.18.0
++cfg_if! {
++=C2=A0 =C2=A0 if #[cfg(libc_const_size_of)] {
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 #[doc(hidden)]
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub const _ALIGNBYTES: usize =3D ::mem::size_= of::<::c_int>() - 1;
++=C2=A0 =C2=A0 } else {
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 #[doc(hidden)]
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 pub const _ALIGNBYTES: usize =3D 4 - 1;
++=C2=A0 =C2=A0 }
++}
++
++pub const MAP_32BIT: ::c_int =3D 0x00080000;
++pub const MINSIGSTKSZ: ::size_t =3D 2048; // 512 * 4


--
Nun= o Teixeira
FreeBSD Committer (ports)
--0000000000008e7b3605f3c72423--