From owner-svn-ports-all@freebsd.org  Sat Nov 30 07:18:43 2019
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id BD3C31CAC54;
 Sat, 30 Nov 2019 07:18:43 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "freefall.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47Q2mM4MP2z3K6x;
 Sat, 30 Nov 2019 07:18:43 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1354)
 id 8F08A16EB1; Sat, 30 Nov 2019 07:18:43 +0000 (UTC)
From: Jan Beich <jbeich@FreeBSD.org>
To: Tobias Kortkamp <tobik@freebsd.org>
Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: Re: svn commit: r518693 - head/games/aquaria
References: <201911300213.xAU2DJOo019231@repo.freebsd.org>
 <20191130045840.GA43413@urd.tobik.me>
Date: Sat, 30 Nov 2019 08:18:43 +0100
In-Reply-To: <20191130045840.GA43413@urd.tobik.me> (Tobias Kortkamp's message
 of "Sat, 30 Nov 2019 05:58:40 +0100")
Message-ID: <eexp-96i4-wny@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Nov 2019 07:18:43 -0000

Tobias Kortkamp <tobik@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