Date: Tue, 23 Nov 2021 13:56:21 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 58ce8baa9d09 - main - games/r1q2: unbreak the build on recent -CURRENT Message-ID: <202111231356.1ANDuLV7085650@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=58ce8baa9d0915ddbb1f0303d845007327fbd1cf commit 58ce8baa9d0915ddbb1f0303d845007327fbd1cf Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2021-11-23 13:55:08 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2021-11-23 13:55:08 +0000 games/r1q2: unbreak the build on recent -CURRENT Something had been changed in our toolchain which broke linking of this port because `SV_FixPlayerSkin' symbol became undefined. This function was annotated as `__inline', change it to `static' to unbreak the build as it is defined and called within a single file only. While here, remove unsupported optimization flag from the CFLAGS. Reported by: pkg-fallout --- games/r1q2/Makefile | 2 ++ games/r1q2/files/patch-binaries__make.inc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/games/r1q2/Makefile b/games/r1q2/Makefile index b1f795e7e2d4..a452fe8547f2 100644 --- a/games/r1q2/Makefile +++ b/games/r1q2/Makefile @@ -71,6 +71,8 @@ PLIST_SUB+= REF_GL="@comment " post-patch: @${REINPLACE_CMD} -e 's|game$$(ARCH)|game|g' \ ${BUILD_WRKSRC}/game/Makefile + @${REINPLACE_CMD} -e '/SV_FixPlayerSkin/s,__inline,static,' \ + ${WRKSRC}/server/sv_game.c pre-build: @${FIND} ${BUILD_WRKSRC} -type d -depth 1 -exec ${MKDIR} {}/.depends \; diff --git a/games/r1q2/files/patch-binaries__make.inc b/games/r1q2/files/patch-binaries__make.inc index 7d0b61a4074c..5deef51b12fe 100644 --- a/games/r1q2/files/patch-binaries__make.inc +++ b/games/r1q2/files/patch-binaries__make.inc @@ -2,7 +2,7 @@ +++ binaries/make.inc Fri Sep 28 21:37:31 2007 @@ -1,5 +1,6 @@ -CFLAGS+=-DNDEBUG -DLINUX -O2 -fno-strict-aliasing -Wall -ffloat-store -pipe -g -MF .depends/$*.d -MMD -+CFLAGS+=-I$(LOCALBASE)/include -DNDEBUG -DLINUX -DDATADIR='"$(Q2DIR)"' -DLIBDIR='"$(LIBDIR)"' -O2 -fno-strict-aliasing -Wall -ffloat-store -pipe -g -MF .depends/$*.d -MMD ++CFLAGS+=-I$(LOCALBASE)/include -DNDEBUG -DLINUX -DDATADIR='"$(Q2DIR)"' -DLIBDIR='"$(LIBDIR)"' -O2 -fno-strict-aliasing -Wall -pipe -g -MF .depends/$*.d -MMD ALLOBJ:=$(ALLSRC:.c=.o) +LDFLAGS+=-L$(LOCALBASE)/lib
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111231356.1ANDuLV7085650>