svn commit: r518693 - head/games/aquaria

[Jan Beich]

Tobias Kortkamp <tobik at freebsd.org> writes:

> On Sat, Nov 30, 2019 at 02:13:19AM +0000, Jan Beich wrote:
>
>> Author: jbeich
>> Date: Sat Nov 30 02:13:18 2019
>> New Revision: 518693
>> URL: https://svnweb.freebsd.org/changeset/ports/518693
>> 
>> Log:
>>   games/aquaria: partially revert r518662
>>   
>>   aarch64 and armv7 weren't affected. amd64 was fixed since LLD 7 but
>>   i386 still fails. Losing LTO (and CFI) support is not worth just for
>>   consistency with an architecture that may become Tier2 in future.
>>   
>>   ld: error: cannot preempt symbol: alGetSourcei
>>   >>> defined in /usr/local/lib/libopenal.so
>>   >>> referenced by FmodOpenALBridge.cpp
>>   >>>               CMakeFiles/aquaria.dir/BBGE/FmodOpenALBridge.cpp.o:(OggDecoder::decode_loop(OggDecoder*))
>>   
>>   Pointy hat to:	jbeich (bug 242307 comment 11)
>
> What do you think about setting 
>
> LDFLAGS_i386=	-Wl,-z,notext
>
> here instead (also in openal-soft)?  It unbreaks the build of either
> one with lld on 12.1 i386.

Looks good. I've also tested runtime in 12.1 i386 jail.

diff --git a/games/aquaria/Makefile b/games/aquaria/Makefile
index 9768cea0964d..08cc0dc5751b 100644
--- a/games/aquaria/Makefile
+++ b/games/aquaria/Makefile
@@ -37,11 +37,13 @@ CMAKE_OFF=	AQUARIA_INTERNAL_FREETYPE \
 		AQUARIA_INTERNAL_TINYXML2 \
 		AQUARIA_INTERNAL_ZLIB
 LDFLAGS+=	-Wl,--as-needed # avoid overlinking (vorbis deps)
+LDFLAGS_i386=	-Wl,-z,notext
 SUB_FILES=	pkg-message
 PLIST_FILES=	bin/aquaria
 PORTDATA=	*
 
-.if ${MACHINE_ARCH} == i386 || exists(/usr/lib/clang/6.0.1)
+# XXX Drop after FreeBSD 12.0 EOL
+.if exists(/usr/lib/clang/6.0.1)
 LLD_UNSAFE=	yes # XXX ports/219089
 .endif