From owner-dev-commits-ports-all@freebsd.org Fri Jun 25 17:58:38 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 610F8640593; Fri, 25 Jun 2021 17:58:38 +0000 (UTC) (envelope-from osa@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GBPrG2MPLz4ssy; Fri, 25 Jun 2021 17:58:38 +0000 (UTC) (envelope-from osa@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1624643918; 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=p/5HaUT7fuN7ZPitJRktPK8RMixQBo/3Gx4e7zdSf+s=; b=sZxeVDxuSdSs03WFmSrqDCMcY9rretgT7FK1IXG2FbTK0shsB6B7KscSi0NcTxHGMKmqt8 Xdi6gWjwsDPjUV97/pZEMy18yeAtU7UYIOd3CpxxS8W8Ze+qRSUitIOP/9EV7+m635YTut N2kZAP2rUr40JVsuFPSjpg1MkjWPri9+0ST6oMppqJqLCHWd3E7pDa4tV9AZvoIN4CCpEd MrdzyAI0RZ59SZG/Q/Qhzps4qkBBiS68snrChDkHRhHl0FHibXHIkMvPvNVzgTlzTTDXLr vb690Y5kCdvoMpHouyncvUkEOo6IBAtgKqKHDSSOhe3DkBpnieCrHV/Nxo8jfA== Received: by freefall.freebsd.org (Postfix, from userid 975) id 41A92148AD; Fri, 25 Jun 2021 17:58:38 +0000 (UTC) Date: Fri, 25 Jun 2021 17:58:38 +0000 From: "Sergey A. Osokin" To: Antoine Brodin 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: References: <202106251754.15PHsem9026130@gitrepo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <202106251754.15PHsem9026130@gitrepo.freebsd.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1624643918; 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=p/5HaUT7fuN7ZPitJRktPK8RMixQBo/3Gx4e7zdSf+s=; b=JJBp06n88ExdZ4/ughAiyOj07DW+IZYBtXD4/7VfYPbCtpbdoCAeF+a7FKnACszBZLiFeR 9eXgwPqLfJyu/Vbh7d2CRiCwPinTLfMZU036I82KTmddcEbJwCSwYH8CosE5lZ39gSrfX/ GyE2/L4fokzHuIfRq6+2WLllfIBO5R/wlIoX6Bj+W4dgFBJWQsW53XFnNJI4AQRuLG/63x W7lJe9f8IE8ALDjWTcD7jPQc70R40BDZB/cW4OOnq5UCZAlGIX6svWn0IJ1Zqnf965drRU IA2oDURwlpaAr0RRbLg82OZdcbBxjtLhm0qFQae2RXzqXvjmIURDREVmWY7KdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1624643918; a=rsa-sha256; cv=none; b=yzvqpDdCRWX6ni99kBYZe8bTbOSVP12jcy4fHI6XuDKbZRacby1WhX2BsiyzV1HMuPGJF6 b7Z8jJRWatyC0dpzkTbr7gKzvsZzJd9t26Qi5gyj0ybkHTY0KmhUeZO+cPArkcTdAwFRQ2 jMvaQqIql0JrjPQeiQPViFOIScn87HoR3QNDYl282V4W+U9XY5YxN9033yoobV4YqhhJ0q rm9kocnnrE0xxTicJaMGxDwilnp3zpi4AdmME3Bpgkaq/VsnP3R7a/RuIonYQWOFK5Y/TL zXEdhdtG+NLNbtc8vpyomMdJhHMa3QXIpy/OLJ8xHA1+/K2xRB2zKHBuyFBtlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2021 17:58:38 -0000 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 > AuthorDate: 2021-06-25 17:54:07 +0000 > Commit: Antoine Brodin > 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}