From nobody Wed Nov 01 22:46:24 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 4SLMYs0mpLz50F2n; Wed, 1 Nov 2023 22:46: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 4SLMYs0DJqz4Ms6; Wed, 1 Nov 2023 22:46:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698878785; 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=YN+W44ajgCUVPeZAVNq13PDykFn+gN7T0hM2D/3zpIE=; b=xblpViHT2XX7qRwSJv0uIrKR45isxNiABUD5NG+8Lc6GhnxGO0iMlUerB9PeD5i6D6fiZ5 t6N2Bzh6MB5HwHqG1j3McwRjH5nEffcMLgPstErX0HzQvGc3Vor206Nz7kLAxjDBca6Fn3 ZTP+ck0mYQiVuxHfx96wSkUC0yqa2+3IoYGBHHTmg0HYpXCjYUKFC0R6eUwS4eh7KcRSx+ 0msHKU4liMsvgdVsomkuHouoSWayRdQPEyURcFBftT4BH5e/eGE5Yvv2Kyxyyu2ZVoBre4 8c48AvxdPQYZ+RjVY3YuMiOEA1qjbgrPjBS4HswCt+9j77lZ5qTWcIFE8GbA2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698878785; 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=YN+W44ajgCUVPeZAVNq13PDykFn+gN7T0hM2D/3zpIE=; b=SjOYrJkYymBXt950v8EYty+dSnqX/BpfUGoVT2SnvMu4ATrTgMiswJq6NE+a9eeHVwyN8e Bk01dFAA7HpS3zghbl1c43CtfpGUNsny99NSoN4Akpf3vvHBMaC+D1557OPB9moGM8qooi Vz78tks993jERjQwokX7d+MKTlU8/MNNAxuSbO/JXV5nsOGX7vwwrzccQehcTeB2yxvWtS 1BjmAQPpOWIpRCmDSOJLYJBreBaKfQiiTTU4+gWT1JgoUXcoEihxjY8+mlf13kiL16e4YN hIoFzozIhntDtlVvnG0dngT3qvzsepKxRKELJfdudZkzwMSo2Q1n5EYICg/Qgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698878785; a=rsa-sha256; cv=none; b=eBsx5y2Ph0mRmqS1Qy+bByD87nf4Xnh4PZxaprkVwhGREDCuhL9xzMA7YTbrqbcTgcK9fx aZ3+vwPmB3unPWrx/GFSPLo8ylDMr+QZEGPiH1BFdMxOsNhtkFfDOlsZ5sH7ENbWBg6gT4 RDuComgHnXncB0MW/gSRO1ZYRkp+QxvyXwp/MZAPl/LVjPXUBZh8sPzYWDHGZGYFX07EkF ZfNG54JKlG6G6dDdauoPZVijc1yAPRbD9Oc2u51CnvNEv/SRinOZo1ju9WGzpu//CsDfBW P8AelkeZo+hJu5nN427e8W96L/O5j6Y24OqBgsipEzvM08aSsoNSE+PQi1RkJQ== 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 4SLMYr65byz14My; Wed, 1 Nov 2023 22:46:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A1MkOlx033191; Wed, 1 Nov 2023 22:46:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A1MkOnY033188; Wed, 1 Nov 2023 22:46:24 GMT (envelope-from git) Date: Wed, 1 Nov 2023 22:46:24 GMT Message-Id: <202311012246.3A1MkOnY033188@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: 94ce30c4a0b1 - main - editors/libreoffice: fix build with lld 17 (take 2) 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: 94ce30c4a0b1044153991c5dd501c802c5c6a0f4 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=94ce30c4a0b1044153991c5dd501c802c5c6a0f4 commit 94ce30c4a0b1044153991c5dd501c802c5c6a0f4 Author: Dimitry Andric AuthorDate: 2023-11-01 22:27:14 +0000 Commit: Dimitry Andric CommitDate: 2023-11-01 22:44:37 +0000 editors/libreoffice: fix build with lld 17 (take 2) Building editors/libreoffice with lld 17 results in the following link errors: ld: error: version script assignment of 'PRIVATE_1.4' to symbol '_ZN3sal13backtrace_getEm' failed: symbol not defined ld: error: version script assignment of 'GLIBCXX_3.4' to symbol '_ZNSs4_Rep20_S_empty_rep_storageE' failed: symbol not defined Add -Wl,--undefined-version to LDFLAGS to suppress these error, as the previous fix did not work in all cases. PR: 274697 Approved by: office (blanket) Fixes: 6338934b7c42 MFH: 2024Q4 --- editors/libreoffice/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 0233368c3362..ea979227381f 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -364,6 +364,8 @@ CXXFLAGS_WARN= -Woverloaded-virtual -Wno-c++11-narrowing \ CXXFLAGS_WARN= -Wshadow -Woverloaded-virtual .endif +LDFLAGS+= -Wl,--undefined-version + post-patch: .if ${COMPILER_FEATURES:Mlibstdc++} ${REINPLACE_CMD} -e 's/gb_CC/gb_CXX/' ${WRKSRC}/solenv/gbuild/platform/unxgcc.mk