From nobody Sun Dec 25 17:54:42 2022 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 4Ng7pp2Rmcz1G6yb; Sun, 25 Dec 2022 17:54:42 +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 4Ng7pp208Lz3CMQ; Sun, 25 Dec 2022 17:54:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671990882; 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=UopCWU7CH3AynT5xAvPOu0uKDjdVfj5G5PPngQung+E=; b=R0FwC86AtPdtw9HFHr/AgMO7hDjg5uHz2XMo1YUR54eBN+kneUhWaV9hgl4T2td94xyo4/ L/Go8hJ4jDCEjj5b9c+tw/ROKGoWFjXdd/lr/mqhE7nFSQkPmkpp21AX3q/es2Yvmrfj6x uPiWVVjnfVck+1zbGGs+7YfEgBaUEnch41EiI7YU+iqBdU6jlUK8ZuEPf5H42xoDv4vChm XUnc9H1WHiH/wCdpo/WlSEh6AJHuErLIXmqC9YEvXHUE7zS8+AmM3G7dSbHSE4rM4Pq7fG rCA8pQfcPcV3bgKytjAVr5S+YXZLQyILTiDukSwbXiSTVXDOenqsozA8ATqLbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671990882; 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=UopCWU7CH3AynT5xAvPOu0uKDjdVfj5G5PPngQung+E=; b=mCi+CPDtRHS+icsdzOVzsiRe4e4wDo1A6LHWDIhW0rd4K5C5+Reac45okpibae7kWPXDWC iNHlR3/yLP9RWqTXFPXzBbTdMhFQcRo82IyL+O4hdlZdeOqzAnY8wD15Kio54Ip98ssYM1 bX/Ausxc742wX4YX8mzyqxLNZe+/OxaO+FP5fShZY0DkjbinDqm5CTN5qBEh+edULMKbwN kfQq7CHNwlcDm7AL4ivNTXbNLrEDgZI0ZFPnoecIUJ6BHvIDgEi3q1iaYjhD1DOvJV5Bas nPt0qHq2GvFbOwQQdcrxXuX9lFfYXaXMTNinkytlVKa2Hgy6Bibduj2Psa29Vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671990882; a=rsa-sha256; cv=none; b=jroIBiEbmbXlDotLnqIoQ2GAYC6OyNG2cLsF+Tegdp0w8gSEAaNqqglorPWbqqy+Jgkr0M x78k0knd1fFp9+fYZ0P8cVtzRrEjPWbPhjR3qO7UkZWrgCP2QzQC2XOX660dgT1pSr293N 5BUdiyMyfmyNYfN1Tgz61IMffhOZ5hGmiGsNgU2cDG7eLKHQc7XTVD3w6zSlzVafrOLi6b sVqxFB4E8K0lOJU3/R9Ic5TZ6iRanjOjmQ7Ys8SAusdjIv5zXh6EcuU6U/g3F8QuDxaKtl GOTyDJYiqi7zCdopSpXY7wkXQYTxs3HRpAP6AI9WTH7ElcCFPQLtp5DPBnmL7Q== 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 4Ng7pp104tz11ct; Sun, 25 Dec 2022 17:54:42 +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 2BPHsgCW042847; Sun, 25 Dec 2022 17:54:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BPHsgY6042846; Sun, 25 Dec 2022 17:54:42 GMT (envelope-from git) Date: Sun, 25 Dec 2022 17:54:42 GMT Message-Id: <202212251754.2BPHsgY6042846@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 145ca5487348 - main - audio/openal-soft: fix build 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 145ca54873489e7d45eac99de62f733a54dc294d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=145ca54873489e7d45eac99de62f733a54dc294d commit 145ca54873489e7d45eac99de62f733a54dc294d Author: Dimitry Andric AuthorDate: 2022-12-20 22:28:41 +0000 Commit: Dimitry Andric CommitDate: 2022-12-25 17:53:21 +0000 audio/openal-soft: fix build with lld 15 on i386 During an exp-run for llvm 15 (see bug 265425), it turned out that audio/openal-soft failed to link with lld 15, on i386: : && /usr/bin/c++ -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -DNDEBUG -Wl,--as-needed -fstack-protector-strong -Wl,-z,notext CMakeFiles/makemhr.dir/utils/makemhr/loaddef.cpp.o CMakeFiles/makemhr.dir/utils/makemhr/loadsofa.cpp.o CMakeFiles/makemhr.dir/utils/makemhr/makemhr.cpp.o -o makemhr -Wl,-rpath,/usr/local/lib: -pthread libsofa-support.a -pthread libcommon.a /usr/local/lib/libmysofa.so /usr/lib/libz.so -lm && : ld: error: makemhr:(.eh_frame+0x14cf): internal linker error: wrote incorrect addend value 0x3400 instead of 0x0 for dynamic relocation R_386_32 at offset 0x408417 against symbol __gxx_personality_v0 This is because lld 15 with assertions enabled (which is default on -CURRENT) checks dynamic relocations more thoroughly, and in combination with -z notext (which was added earlier for bug 242307) results in the above diagnostic. Work around it by disabling the dynamic relations checks on i386. PR: 268495 Approved by: maintainer timeout (2 weeks) MFH: 2022Q4 --- audio/openal-soft/Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile index 61c9c48644bd..0ff75a86b989 100644 --- a/audio/openal-soft/Makefile +++ b/audio/openal-soft/Makefile @@ -23,6 +23,16 @@ CMAKE_ON= ALSOFT_BACKEND_WAVE LDFLAGS+= -Wl,--as-needed LDFLAGS_i386= -Wl,-z,notext +.include + +# The following is actually meant for lld 15.0 and later, but the ports +# framework does not support LINKER_TYPE and LINKER_VERSION yet. +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150 +# Turn off checking of dynamic relocations, to avoid lld diagnostics about +# possibly incorrect addend values. +LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations +.endif + PLIST_SUB= SOVERSION=${PORTVERSION} OPTIONS_DEFINE= CONFIG EXAMPLES JACK OSS PORTAUDIO PULSEAUDIO \