svn commit: r518693 - head/games/aquaria

[Tobias Kortkamp]

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.

> 
> Modified:
>   head/games/aquaria/Makefile   (contents, props changed)
> 
> Modified: head/games/aquaria/Makefile
> ==============================================================================
> --- head/games/aquaria/Makefile	Sat Nov 30 02:10:21 2019	(r518692)
> +++ head/games/aquaria/Makefile	Sat Nov 30 02:13:18 2019	(r518693)
> @@ -41,8 +41,7 @@ SUB_FILES=	pkg-message
>  PLIST_FILES=	bin/aquaria
>  PORTDATA=	*
>  
> -# XXX Drop after FreeBSD 12.0 EOL
> -.if exists(/usr/lib/clang/6.0.1)
> +.if ${MACHINE_ARCH} == i386 || exists(/usr/lib/clang/6.0.1)
>  LLD_UNSAFE=	yes # XXX ports/219089
>  .endif
>  
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20191130/9e5e88bb/attachment.sig>