Date: Tue, 28 Feb 2023 17:11:16 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: dae4d6bdd2a5 - main - games/aquaria: unbreak with LLD 15 on i386 Message-ID: <202302281711.31SHBGXC097266@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=dae4d6bdd2a5e24f09b1a87335c00507a3da1cb0 commit dae4d6bdd2a5e24f09b1a87335c00507a3da1cb0 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-02-28 17:01:48 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-02-28 17:09:52 +0000 games/aquaria: unbreak with LLD 15 on i386 ld: error: aquaria:(.eh_frame+0x4a4f7): internal linker error: wrote incorrect addend value 0xC2E5B08 instead of 0x0 for dynamic relocation R_386_32 at offset 0x4C5CD7 against symbol __gxx_personality_v0 Reported by: pkg-fallout --- games/aquaria/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/games/aquaria/Makefile b/games/aquaria/Makefile index 6af95b29c99c..fd6c92da404f 100644 --- a/games/aquaria/Makefile +++ b/games/aquaria/Makefile @@ -39,11 +39,16 @@ CMAKE_OFF= AQUARIA_INTERNAL_FREETYPE \ AQUARIA_INTERNAL_TINYXML2 \ AQUARIA_INTERNAL_ZLIB LDFLAGS+= -Wl,--as-needed # avoid overlinking (vorbis deps) -LDFLAGS_i386= -Wl,-z,notext +LDFLAGS_i386= -Wl,-z,notext -Wl,--no-check-dynamic-relocations SUB_FILES= pkg-message PLIST_FILES= bin/aquaria PORTDATA= * +# XXX Drop after FreeBSD 12.3 EOL around 2023-03-31 (don't forget distinfo) +.if !exists(/usr/include/c++/v1/concepts) +LDFLAGS_i386:= ${LDFLAGS_i386:N*no-check-dynamic-relocations*} +.endif + DESKTOP_ENTRIES="${GH_PROJECT}" \ "" \ "${DATADIR}/${PORTNAME}.png" \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302281711.31SHBGXC097266>