Date: Tue, 15 Jun 2021 04:24:46 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: 9041a8ad49db - main - emulators/uae: the port had been improved (+) Message-ID: <202106150424.15F4Ok22017079@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=9041a8ad49dbd033363fac75c02baf9723871af4 commit 9041a8ad49dbd033363fac75c02baf9723871af4 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2021-06-15 04:23:34 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2021-06-15 04:23:48 +0000 emulators/uae: the port had been improved (+) - Unbreak the build on modern FreeBSD versions by avoiding injecting duplicate symbols in the object files - Drop MAKE_JOBS_UNSAFE: it was added back in 2013 in the commit 2a5c8652e56c1 to fix the build error: crt1.c:(.text+0xa8): undefined reference to `main' gmake[2]: *** [build68k] Error 1 which no longer manifests itself PR: 256577 --- emulators/uae/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile index 48f74f099db2..1e8d44473714 100644 --- a/emulators/uae/Makefile +++ b/emulators/uae/Makefile @@ -11,11 +11,7 @@ COMMENT= Commodore Amiga emulator LICENSE= GPLv2 -BROKEN_FreeBSD_13= ld: error: duplicate symbol: socketbases -BROKEN_FreeBSD_14= ld: error: duplicate symbol: socketbases - CONFLICTS= e-uae-[0-9]* -MAKE_JOBS_UNSAFE=yes USES= gmake gnome pkgconfig tar:bzip2 GNU_CONFIGURE= yes @@ -26,6 +22,8 @@ OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's|build68kc|build68k|' \ ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e 's|struct socketbase {|extern &|' \ + ${WRKSRC}/src/include/bsdsocket.h @${LN} -sf ../md-ppc/support.c ${WRKSRC}/src/md-ppc-gcc/support.c do-install:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106150424.15F4Ok22017079>