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 <g...@freebsd.org> > AuthorDate: 2021-02-18 23:52:39 +0000 > Commit: Glen Barber <g...@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
signature.asc
Description: PGP signature