Re: git: 8848573087ff - 2023Q4 - www/nginx: fix build with a third-party passenger module
Date: Sun, 03 Dec 2023 11:56:12 UTC
As I already mentioned on Bugzilla, it's my totally fault I misunderstood
the date I submitted a patch to bugzilla. I was looking into 2 PRs
concurrently so I god them mixed up. I'm sorry about that.
I believe tested build fixes are covered under blanket approval. Correct me
if I misunderstood.
On Sun, Dec 03, 2023 at 11:01:26AM +0100, Jochen Neumeister wrote:
> Is it normal that you just do something like that here without consulting
> anyone? What do we have rules for here?
>
>
> Am 03.12.23 um 10:58 schrieb Koichiro Iwao:
> > The branch 2023Q4 has been updated by meta:
> >
> > URL: https://cgit.FreeBSD.org/ports/commit/?id=8848573087ff210c5383adcd899b055c50467fb4
> >
> > commit 8848573087ff210c5383adcd899b055c50467fb4
> > Author: Jochen Neumeister <joneum@FreeBSD.org>
> > AuthorDate: 2023-12-03 07:51:41 +0000
> > Commit: Koichiro Iwao <meta@FreeBSD.org>
> > CommitDate: 2023-12-03 09:57:04 +0000
> >
> > www/nginx: fix build with a third-party passenger module
> > PR: 275161
> > Sponsored by: Netzkommune GmbH
> > This commit is required to complete PR 275161. The fix for
> > www/nginx-devel is not necessary at the moment.
> > (cherry picked from commit b31426d1f77c12e47a60ff4b6b663826afd4702f)
> > ---
> > www/nginx/Makefile | 6 +++++-
> > 1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/www/nginx/Makefile b/www/nginx/Makefile
> > index be56e8b593c4..d037ba99710a 100644
> > --- a/www/nginx/Makefile
> > +++ b/www/nginx/Makefile
> > @@ -1,6 +1,6 @@
> > PORTNAME= nginx
> > PORTVERSION= 1.24.0
> > -PORTREVISION?= 12
> > +PORTREVISION?= 13
> > PORTEPOCH= 3
> > CATEGORIES= www
> > MASTER_SITES= https://nginx.org/download/ \
> > @@ -240,6 +240,10 @@ CONFIGURE_ENV+= OPTIMIZE="yes"
> > CFLAGS+= -DNDEBUG
> > .endif
> > +.if ${PORT_OPTIONS:MPASSENGER}
> > +CONFIGURE_ENV+= EXTRA_PRE_CXXFLAGS="-std=c++14"
> > +.endif
> > +
> > # Fix build failure on clang >= 12
> > .if ${PORT_OPTIONS:MHTTP_PERL} && ${OSVERSION} >= 1301000
> > CFLAGS+= -Wno-compound-token-split-by-macro
--
meta <meta@FreeBSD.org>