Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Nov 2019 02:13:19 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r518693 - head/games/aquaria
Message-ID:  <201911300213.xAU2DJOo019231@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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)

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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911300213.xAU2DJOo019231>