Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Jun 2021 17:58:38 +0000
From:      "Sergey A. Osokin" <osa@freebsd.org>
To:        Antoine Brodin <antoine@freebsd.org>
Cc:        ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org
Subject:   Re: git: 5953db5520da - main - www/unit*: fix syntax error
Message-ID:  <YNYZTlGiIh4j7Bb/@FreeBSD.org>
In-Reply-To: <202106251754.15PHsem9026130@gitrepo.freebsd.org>
References:  <202106251754.15PHsem9026130@gitrepo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Thanks, Antoine!

On Fri, Jun 25, 2021 at 05:54:40PM +0000, Antoine Brodin wrote:
> The branch main has been updated by antoine:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=5953db5520dafbf28b3b2e46d1cc62f0a01706f2
> 
> commit 5953db5520dafbf28b3b2e46d1cc62f0a01706f2
> Author:     Antoine Brodin <antoine@FreeBSD.org>
> AuthorDate: 2021-06-25 17:54:07 +0000
> Commit:     Antoine Brodin <antoine@FreeBSD.org>
> CommitDate: 2021-06-25 17:54:07 +0000
> 
>     www/unit*: fix syntax error
> ---
>  www/unit-perl/Makefile | 5 -----
>  www/unit/Makefile      | 7 +++++++
>  2 files changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/www/unit-perl/Makefile b/www/unit-perl/Makefile
> index 526a7fed4bb8..725afb62fefb 100644
> --- a/www/unit-perl/Makefile
> +++ b/www/unit-perl/Makefile
> @@ -16,11 +16,6 @@ USE_RC_SUBR?=	# reset to empty
>  
>  MASTERDIR=	${.CURDIR}/../unit
>  
> -# Fix build failure on clang12
> -.if ${OSVERSION} >= 1400023
> -CFLAGS+=	-Wno-compound-token-split-by-macro
> -.endif
> -
>  post-configure:
>  	cd ${CONFIGURE_WRKSRC} && \
>  	${CONFIGURE_CMD} perl --module=${UNIT_MODNAME}
> diff --git a/www/unit/Makefile b/www/unit/Makefile
> index a6f321c9e45a..8b80ce335356 100644
> --- a/www/unit/Makefile
> +++ b/www/unit/Makefile
> @@ -106,6 +106,13 @@ CONFIGURE_ARGS+=--no-unix-sockets
>  CONFIGURE_ARGS+=--control=unix:${UNIT_SOCK}
>  .endif
>  
> +.if defined(UNIT_MODNAME) && ${UNIT_MODNAME:Mperl*}
> +# Fix build failure on clang12
> +.if ${OSVERSION} >= 1400023
> +CFLAGS+=	-Wno-compound-token-split-by-macro
> +.endif
> +.endif
> +
>  .if !target(post-install)
>  post-install:
>  	${MKDIR} ${STAGEDIR}${UNIT_DBDIR}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YNYZTlGiIh4j7Bb/>