git: 5b4e16b26a12 - main - games/pacmanarena: unbreak the build in the -fno-common mode

Alexey Dokuchaev danfe at FreeBSD.org
Tue Jun 15 04:53:35 UTC 2021


The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5b4e16b26a1214e077376dacc664f57f3664f913

commit 5b4e16b26a1214e077376dacc664f57f3664f913
Author:     Alexey Dokuchaev <danfe at FreeBSD.org>
AuthorDate: 2021-06-15 04:52:36 +0000
Commit:     Alexey Dokuchaev <danfe at FreeBSD.org>
CommitDate: 2021-06-15 04:52:47 +0000

    games/pacmanarena: unbreak the build in the -fno-common mode
    
    Remove needless ``char *keyboard_map'' definition from the header file
    to unbreak the build against modern compilers, e.g. Clang 11 and GCC 10.
    
    PR:     256555
---
 games/pacmanarena/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/games/pacmanarena/Makefile b/games/pacmanarena/Makefile
index 0dfaa7415b8d..beadd8ccf28a 100644
--- a/games/pacmanarena/Makefile
+++ b/games/pacmanarena/Makefile
@@ -16,9 +16,6 @@ COMMENT=	Pacman clone in full 3D with a few surprises
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: keyboard_map
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: keyboard_map
-
 WRKSRC=		${WRKDIR}/${PORTNAME:S/arena//}
 
 USES=		gnome sdl
@@ -39,6 +36,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|@prefix@|${DATADIR}|; \
 		s|@datadir@/pacman|${DATADIR}|' \
 		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/keyboard_map/,+1d' \
+		${WRKSRC}/include/input.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME:S/arena//} \


More information about the dev-commits-ports-main mailing list