Date: Mon, 31 Aug 2020 16:35:12 +0000 From: Alexey Dokuchaev <danfe@freebsd.org> To: Mathieu Arnold <mat@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r547148 - in head/games: q2pro qstat quetoo/files r1q2/files Message-ID: <20200831163512.GA4459@FreeBSD.org> In-Reply-To: <20200831162321.67vsmybiqtr6tkyr@aching.in.mat.cc> References: <202008310400.07V40LVQ085072@repo.freebsd.org> <20200831162321.67vsmybiqtr6tkyr@aching.in.mat.cc>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Aug 31, 2020 at 06:23:21PM +0200, Mathieu Arnold wrote: > On Mon, Aug 31, 2020 at 04:00:21AM +0000, Alexey Dokuchaev wrote: > > +# Fix the build with -fno-common (for Clang 11 and GCC 10) > > + @${REINPLACE_CMD} -e '/^unsigned[[:blank:]]*d_8to24table/,+1d' \ > > + ${WRKSRC}/ref_soft/sw_main.c > > + @${REINPLACE_CMD} -e '/\*cl_paused/,+1d' \ > > + ${WRKSRC}/source/cl_null.c > > Just a reminder folkds, REINPLACE_CMD is to be used only when replacing > dynamic content, static replacements like this must go in patch files. True, but still being a general guidance (which I always keep in mind and often follow), not a hard rule that cannot be bent. > Especially as there is alreardy a patch file just for that: > > > Modified: head/games/quetoo/files/patch-clang-fixes This patch if for another port (and yes I've amended it in that case). The part you've quoted is for `games/q2pro' which 1) does not have a cumulative `patch-clang-fixes' like `games/quetoo' does, 2) already carries more than enough patches, 3) is planned to get updated to the latest version which would hopefully allow to retire most of them. ./danfe
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200831163512.GA4459>