From nobody Tue Oct 24 19:20: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 4SFMMh5f9pz4yNsm; Tue, 24 Oct 2023 19:20: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 4SFMMh51Flz4ML9; Tue, 24 Oct 2023 19:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698175216; 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=5Vl6+YwRlId/nWzt3Z1BB84/w9cZvQWQ97AulzFjNVk=; b=o19wvHwktS5X2rLniVs8Avp4mTOvfo/68ZZk4eI8g07dVbu81yVMaUv+wMydAIdNIrqNFd 5TZY4Tvyn8YD3yLY/H28Xdon8cPw6nNtEAg2/v6U0soYAnJy7uG3xTH3mTfEVXQpE83BCW ZSBnEwswcfFfm99uzHHYrAf0g8cU5OhuD9bCZPOIL5i28TfR+NVlTNDSb/HpnpCZ1YmuIK edWPszty01htOrI2pg354SG7OpbIRQjquPAVkzb8nkYDy/Ucidq3t5nMAKYQRscEVidCnW Gb1HW4kezdGYyaUtzF9beBge5G3l+Z6M4gTzXDDnVwxTeo66WA8erz0Q0rT8mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698175216; a=rsa-sha256; cv=none; b=WPcWnMJJ0kQ7SlsjGqPs+VMvtLdPadBxRdb2uPLx3JoFh58pFM4lb+x58zoWppu4pV/Y7h MgnByY+775BygPXkwO28yefFDsDBNONUYes66jN5OIBUnRqfLk1lvcVQ7/I4or5wpUTTh/ QsBHv9kgY3ptLDhq7x6JCSd2JN0HEfzid8EK7RauXBxRdWW0m8i2MiqVFG/Od+sf3jzBcM z+4QcRy3Vy5yrVvri24kRWR0bGgYVtophTBYaoNj7j50PcUu+kOLYujrZ/UEYemnsHW5E2 ICXcyp2bMFv939lP4xS21yyp9wIgBYtLqMbbv6MOGGkZi5CURaicO9SyU0iDVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698175216; 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=5Vl6+YwRlId/nWzt3Z1BB84/w9cZvQWQ97AulzFjNVk=; b=JFugZyG47ETYU6VpCjGytAwbhr7IkesLiLfDmH6XKr7/wdtVqSbW0Kf66F4p9rm19cK5lF gg7zDgSsgdnAwfNfKBvo0f7w6TNWP23AkKVWvCNbrBzIpi04gl+7iaJGwvD/+ckX+zaEHy 0slApZ8kPkn+M44jjdwN/4/tHRWGEW7YDyT3Igqs4gx2s5xihBGuYGi5pA2xkjiFqv9koQ VEsz9EUK5xcmTDE0ZiedubFyA2CQIdEYt8RFLyoYBn5QqDgrm4exFWE8kcYsI9BF7c2TmT 84CWKqnsfs08hIAaSXGlYrxYVS17n+kK8WRykV1DOw3oofU7nKnyRl/bInqK5g== 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 4SFMMh3yD2zZqB; Tue, 24 Oct 2023 19:20:16 +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 39OJKGd3066148; Tue, 24 Oct 2023 19:20:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OJKGJn066140; Tue, 24 Oct 2023 19:20:16 GMT (envelope-from git) Date: Tue, 24 Oct 2023 19:20:16 GMT Message-Id: <202310241920.39OJKGJn066140@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 6338934b7c42 - main - editors/libreoffice: fix build with lld 17 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6338934b7c42825d661bca04efbaef58f9439c70 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=6338934b7c42825d661bca04efbaef58f9439c70 commit 6338934b7c42825d661bca04efbaef58f9439c70 Author: Dimitry Andric AuthorDate: 2023-10-24 19:16:35 +0000 Commit: Dima Panov CommitDate: 2023-10-24 19:20:05 +0000 editors/libreoffice: fix build with lld 17 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 Upstream fixed this only for Linux with: https://github.com/LibreOffice/core/commit/baddc742c3fe260d20d7924ab134f0fbf179fd85 Add the same block to the more generic unxgcc.mk makefile, so it gets picked up for FreeBSD too. PR: 274697 Author: Dimitry Andric --- .../files/patch-solenv_gbuild_platform_unxgcc.mk | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/editors/libreoffice/files/patch-solenv_gbuild_platform_unxgcc.mk b/editors/libreoffice/files/patch-solenv_gbuild_platform_unxgcc.mk index 3bac7767ea5d..bb88c812c0eb 100644 --- a/editors/libreoffice/files/patch-solenv_gbuild_platform_unxgcc.mk +++ b/editors/libreoffice/files/patch-solenv_gbuild_platform_unxgcc.mk @@ -1,6 +1,17 @@ ---- solenv/gbuild/platform/unxgcc.mk.orig 2022-12-22 00:14:09 UTC +--- solenv/gbuild/platform/unxgcc.mk.orig 2023-09-22 19:07:01 UTC +++ solenv/gbuild/platform/unxgcc.mk -@@ -55,8 +55,7 @@ gb_CXXFLAGS := \ +@@ -17,6 +17,10 @@ + # the License at http://www.apache.org/licenses/LICENSE-2.0 . + # + ++ifneq ($(findstring lld,$(USE_LD)),) ++USE_LD += -Wl,--undefined-version ++endif ++ + # to block heavy exception handling that try to acquire the solarmutex + export LO_LEAN_EXCEPTION=1 + +@@ -55,8 +59,7 @@ gb_CXXFLAGS := \ gb_CXXFLAGS := \ $(gb_CXXFLAGS_COMMON) \ -fPIC \