Date: Sat, 22 Jul 2023 03:31:50 +0000 From: Glen Barber <gjb@freebsd.org> To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: a1e58f1f630f - stable/13 - release: pass UNAME_r to fix building 14.x ports on 13.x Message-ID: <20230722033150.GX1219@FreeBSD.org> In-Reply-To: <202307220324.36M3OXFu085901@gitrepo.freebsd.org> References: <202307220324.36M3OXFu085901@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Sat, Jul 22, 2023 at 03:24:33AM +0000, Glen Barber wrote: > The branch stable/13 has been updated by gjb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=a1e58f1f630ffa2de1d54d9d59a7d0ab2a178695 > > commit a1e58f1f630ffa2de1d54d9d59a7d0ab2a178695 > Author: Glen Barber <gjb@FreeBSD.org> > AuthorDate: 2021-02-18 23:52:39 +0000 > Commit: Glen Barber <gjb@FreeBSD.org> > CommitDate: 2023-07-22 03:23:06 +0000 > > release: pass UNAME_r to fix building 14.x ports on 13.x > > Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd > Sponsored by: PayPal https://paypal.me/gjbbsd > > (cherry picked from commit 80ab50e1de19ca125f05a13937c796d48c4edd4a) > This indeed was an empty commit. The conflict resolved here was fixed in a previous commit where UNAME_r was adjusted, so this cherry-pick is empty as result of that former resolution. Glen [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmS7TaAACgkQAxRYpUeP 4pPY3A//VJiPQ8UeP/L35owCvDUTsCxTlcrODLLv95ExuV67kPAnz1WjrFZUcXKy Z9/RWL4XJZ+MJQMCb4rxoeTmHGJpoX/RSAI7hcQp1s9+Ba1HvqmKuhAc2xfK1sek UPNeVS079JXOx3aANcMmnxowgWYgxHoou+KA6d6irq6Eus/4MQp7utO0dXfUbwup Xnn0Rymw+sSIxPqrOmiPGl6NKwXUpOBTSR75LC07+V3T28itful60dsjyeCZFMgs xqT5hrC5LhGOaF/9+J2V9y45cQ8ZW+zAl9eSdBw3lLCFbtJZY3tQT8Akll3PDb4Q 6qo2nvwM8cpevqolFwe7Z22oveuZ9WItMkAIG3ganNnLZRbOw0BTp5k/5nFIlqyg /V+14yCXErk3+VjZTQ6eevwueSZDyORaQBNcwNynGmbadFl5IsMvm+fqfag1o0eq LYwSuF1HAbnL6AJpmJIcdJb/NG20TY+yi7NwI7twLeFThwxsQSPiK15yEZYZ4VqB +RJ3dRL+AA/gYSfDw7nl+EBQhhiylpAimtDwwoiYc8dci34WdlmtWXFzq3CK3Zkl wUHK7VX23R/B6YkE8x51rpORiTQMs7yUbJLBVNWAwcDUWON3hyA6S8MyG3/hxnuc lGb/0Zfpqvv1X0mbxBvkOVQa3RLYUmO62tppnfTRetGBqodpn1o= =DOaz -----END PGP SIGNATURE-----help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20230722033150.GX1219>