git: c2358eae9711 - main - games/sdlroids: fix build with -fno-common
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 14 Apr 2023 14:18:05 UTC
The branch main has been updated by fuz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c2358eae9711252708bd98cbcca6352053e648fc
commit c2358eae9711252708bd98cbcca6352053e648fc
Author: Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-04-13 13:45:28 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-04-14 14:16:10 +0000
games/sdlroids: fix build with -fno-common
Turn a variable definition in a header file into a declaration.
This fixes the build on FreeBSD 13+.
---
games/sdlroids/Makefile | 7 ++-----
games/sdlroids/files/patch-getargs.h | 8 ++++++++
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/games/sdlroids/Makefile b/games/sdlroids/Makefile
index 5acf611a9dc9..e2dd47fe9b49 100644
--- a/games/sdlroids/Makefile
+++ b/games/sdlroids/Makefile
@@ -1,6 +1,6 @@
PORTNAME= sdlroids
-PORTVERSION= 1.3.4
-PORTREVISION= 18
+DISTVERSION= 1.3.4
+PORTREVISION= 19
CATEGORIES= games
MASTER_SITES= SF \
SF/nemysisfreebsdp/${CATEGORIES}/:icons
@@ -16,9 +16,6 @@ WWW= https://sourceforge.net/projects/sdlroids/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BROKEN_FreeBSD_13= ld: error: duplicate symbol: flagargs
-BROKEN_FreeBSD_14= ld: error: duplicate symbol: flagargs
-
USES= gmake sdl tar:bzip2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --datadir=${PREFIX}/share
diff --git a/games/sdlroids/files/patch-getargs.h b/games/sdlroids/files/patch-getargs.h
new file mode 100644
index 000000000000..7d3a4d7be14d
--- /dev/null
+++ b/games/sdlroids/files/patch-getargs.h
@@ -0,0 +1,8 @@
+--- getargs.h.orig 2023-04-13 13:43:47 UTC
++++ getargs.h
+@@ -37,4 +37,4 @@
+
+ /* getargs() prototype */
+ void getargs(int, char *[]);
+-int flagargs[NUMARGS];
++extern int flagargs[NUMARGS];