From nobody Tue Feb 28 17:11:16 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PR3mh4Dp7z3thZy; Tue, 28 Feb 2023 17:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PR3mh3pZcz3PgQ; Tue, 28 Feb 2023 17:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677604276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fl4mg94JQKA91vSEKvNijVjGtqVX9zrOWw+2U2cQfuE=; b=NeQK2n5kugGTbDC2dLdfjmK1TRlYQ/AZdzjBBd4B9R3oT+EkwuMBB+pcwG6suTBEeDbX+s YtioFPYEJqPDAAsgcY/GBPE3c+ubDLjlIww0tSnJK1R+Jk7uCoDZtDFPK7wTC2Nql2IPwn 32pyynjv7tZaylfHnBPcmPQb0pPXzdTiE0eET4kUB6GevY0nCvXtn13rWQVze/ijr76Klm NqVByZa/4Cp1sX/8qTFYftXEYNgh1/UQPL8EXAs9zfxpWua82iHYpINT0SYuhFoAsX9jj0 SkFC8OiXoeSaJPKBDSgR2M6O2zFiy7OXTSsHpWutiPgv8KSvPiY/lkOgalBWmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677604276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fl4mg94JQKA91vSEKvNijVjGtqVX9zrOWw+2U2cQfuE=; b=grSIzwAbTNrBwjfSN36K9B7MBJy7Sptz7fP+uP8nkcS7BrMqXhihN1u/kxYNrKsQrvkweN nSOR9QHmF5AXlmk7eES5nxNDY1Pf0hI0y0yzZDd8OcYZdmpuI28jSGp2PPnyXtx2HxlbD4 c3VuOM7PQcoJMvptD/eRLD0dE2/Vi1we0+jaKDQ29SoleRqylYS+EAc5x5sDI5ArfndiIt L4eiGdwkyavroofGRCDeai2FZGEA1b/PWHhA6XS7pFbSIbKgL8T5ctFHqvMsFOwOhreJ0D sUZIL8EeOjSBG2vsmErJ36rBgujB8zJnZYUsLmz4zgDhEwDuPaLO0M4tkylhMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677604276; a=rsa-sha256; cv=none; b=swsgk1QQM4N/fmjRUP+lLmbgWsHTjkUG/JZmTbPOqRdzYOvnlVEzn1ukhZNoWB9mHZLo5I FcJC0IVRN9QqN6ss6IlmccSCgAL/pnSppRGqbe0FH8TymqfqoFTl8Jh3gh3nwwfpYqv8lm Rdl+BWxq7Fx6Ch1sjdpXlBVRpv1LiZXMkLpVwA+BbFi7qAlzYyvAOQa5YU4IHN3PBo2lvW BSfp3k5ajSdRQXyv2dNX8u33mtJLpf2QZngom+xFWCXpjjqVtBsHdB7hMwkNLN8aDBEU81 eWtRYP8VMxvaV4BOqSpJPhku2JTmPEXE5E5bLpH6wKwe424EIxtX4jmFQz2Rcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PR3mh2sG6z1FW9; Tue, 28 Feb 2023 17:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31SHBGcs097267; Tue, 28 Feb 2023 17:11:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SHBGXC097266; Tue, 28 Feb 2023 17:11:16 GMT (envelope-from git) Date: Tue, 28 Feb 2023 17:11:16 GMT Message-Id: <202302281711.31SHBGXC097266@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: dae4d6bdd2a5 - main - games/aquaria: unbreak with LLD 15 on i386 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dae4d6bdd2a5e24f09b1a87335c00507a3da1cb0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=dae4d6bdd2a5e24f09b1a87335c00507a3da1cb0 commit dae4d6bdd2a5e24f09b1a87335c00507a3da1cb0 Author: Jan Beich AuthorDate: 2023-02-28 17:01:48 +0000 Commit: Jan Beich 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" \