From nobody Tue Apr 26 19:11:25 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 9935F1999653; Tue, 26 Apr 2022 19:11:25 +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 4Kns1T3xHtz3pBf; Tue, 26 Apr 2022 19:11:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651000285; 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=YqlsWsTMFwaYPCHaTkKHkVSQ7GuJNiJp0Nf90T5zLcQ=; b=QYTU0neKjB7LDiGj/hWS9lILZOKFkeCws4jE2U9WQXM3dZeHdsW/CfsDopy7enMLUOCMdB nG/ZfUKyMePrBLibRsmEaGxJVTzSCcYRWZ/TtvD1Eaukjx6BjrF0UoGokwQ8cFyNLJ3uXg Stne1vHgXRSldqOvgck1/PiA+L+1c5+7X7MkfvZ7MNqzd9Kzs5PSQJgFm/9+f31FJpM+ef +2STL87eNWkqu6g7aMDeD/2wxsX+ahSY6F86xIwRDD48uHoLvsNnXcQqH4TlnXi/fKZcF/ GW5OTdMQA5fmPUcvd/sr5vv8bregKXj2sP9JHcX+1aH0tTcajk7UpfhPWg9v6Q== 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 670BD14FC8; Tue, 26 Apr 2022 19:11:25 +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 23QJBPfw080211; Tue, 26 Apr 2022 19:11:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QJBPek080210; Tue, 26 Apr 2022 19:11:25 GMT (envelope-from git) Date: Tue, 26 Apr 2022 19:11:25 GMT Message-Id: <202204261911.23QJBPek080210@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: 2e829590a96d - main - audio/mumble audio/murmur: fix build with lld 14 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: 2e829590a96d69731cc0662d048f38e0dc8d79e7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651000285; 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=YqlsWsTMFwaYPCHaTkKHkVSQ7GuJNiJp0Nf90T5zLcQ=; b=PB2ZKnUDLxdelF6f+QwI4MO3WvGH3bRoBsN74ZKpTvUCOk7ZFzPyrg8qDVMs70dc8MkaoZ NjrgPe7GV2sp8Cp7TJo0fhtoWu6/MEiWkhaTMvnz//y13hj69KZ0xCYl69Y5m7XnRQ2jzZ +eAasuBpgJrlx/v4bDQ1FyoWppI795/JVppjvHg6IYTFbhCitfaerBI4jufXCzeeFO9TnX R7Numrh6sm7V+MaTtJ+nyDuT9DjnjQRSjEw8pXIloANjZQsKJ4PDZxFY/sFQATiY5wBA4V m6qvHxXDa22xz6/7ROAO4GPpSmidwtcgd4mpqDEIozl2eXNp+IfsnDCGC9waGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651000285; a=rsa-sha256; cv=none; b=CQQ9Gk90LevddUwDb3xfofJMhgo6CxoJBGdIMqDSI5hKIrgzyx17sY3NxngUPbuzN/9LeO juU4Mo5iKRABsx/oQKpou+sfhR8WLFNouIgVJ9f5kOxFwlvJ0lqXZKuktpzlAp3IRFpEYl oJgLQ3ij4ICBbx7nNECFEj7w7aSijglFORrjuVQj+bQtCxetSgFg6i+qld+B1nmXN3lzk7 WqSN3ENwV03fgztYzTZzCuCyJQDKR/SQKvxh+SmZ840rzzZoH0RSryrmzS9zQX7WVG1gnZ K0ysqVoZ+DjX15jYTJuRQcpjWhMNuiQ05PeL2munGVCJIWxXLaHxC1iwHxCsvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=2e829590a96d69731cc0662d048f38e0dc8d79e7 commit 2e829590a96d69731cc0662d048f38e0dc8d79e7 Author: Dimitry Andric AuthorDate: 2022-04-05 19:41:05 +0000 Commit: Dimitry Andric CommitDate: 2022-04-26 19:10:01 +0000 audio/mumble audio/murmur: fix build with lld 14 During an exp-run for llvm 14 (see bug 261742), it turned out that audio/mumble and audio/murmur fail to build with lld 14: c++ -fstack-protector-strong -pie -Wl,--no-add-needed -Wl,-z,relro -Wl,-z,now -shared -Wl,-soname,libcelt0.so.0 -o libcelt0.so.0.7.0 ../../debug/.obj/celt-0.7.0-build/bands.o ../../debug/.obj/celt-0.7.0-build/celt.o ../../debug/.obj/celt-0.7.0-build/cwrs.o ../../debug/.obj/celt-0.7.0-build/entcode.o ../../debug/.obj/celt-0.7.0-build/entdec.o ../../debug/.obj/celt-0.7.0-build/entenc.o ../../debug/.obj/celt-0.7.0-build/header.o ../../debug/.obj/celt-0.7.0-build/kiss_fft.o ../../debug/.obj/celt-0.7.0-build/kiss_fftr.o ../../debug/.obj/celt-0.7.0-build/laplace.o ../../debug/.obj/celt-0.7.0-build/mdct.o ../../debug/.obj/celt-0.7.0-build/modes.o ../../debug/.obj/celt-0.7.0-build/pitch.o ../../debug/.obj/celt-0.7.0-build/psy.o ../../debug/.obj/celt-0.7.0-build/quant_bands.o ../../debug/.obj/celt-0.7.0-build/rangedec.o ../../debug/.obj/celt-0.7.0-build/rangeenc.o ../../debug/.obj/celt-0.7.0-build/rate.o ../../debug/.obj/celt-0.7.0-build/vq.o -L/usr/lib/x86_64-unknown-freebsd14.0/c++11 - L/usr/lib -L/usr/local/lib c++: warning: argument unused during compilation: '-pie' [-Wunused-command-line-argument] ld: error: unknown argument '--no-add-needed' c++: error: linker command failed with exit code 1 (use -v to see invocation) This is because lld upstream removed the deprecated --no-add-needed option, which should be replaced with --no-copy-dt-needed-entries instead. (Note that BFD ld still accepts the --no-add-needed option, but is also deprecated there, so it might go away.) PR: 263071 Approved by: maintainer timeout (2 weeks) MFH: 2022Q2 --- audio/mumble/Makefile | 1 + audio/murmur/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile index 5670e5ccadb1..34765342962f 100644 --- a/audio/mumble/Makefile +++ b/audio/mumble/Makefile @@ -89,6 +89,7 @@ MAKE_JOBS_UNSAFE=yes post-patch: @${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro + @${REINPLACE_CMD} -e 's|--no-add-needed|--no-copy-dt-needed-entries|' ${WRKSRC}/qmake/compiler.pri @${RM} ${WRKSRC}/plugins/manual/.qmake.cache do-install: diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile index 53bad377571b..678ad3e7a3cd 100644 --- a/audio/murmur/Makefile +++ b/audio/murmur/Makefile @@ -61,6 +61,7 @@ CONFIG+= no-pch .endif post-patch: + @${REINPLACE_CMD} -e 's|--no-add-needed|--no-copy-dt-needed-entries|' ${WRKSRC}/qmake/compiler.pri @${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro pre-install: