From nobody Wed Nov 01 22:46:23 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 4SLMYq71H2z50F2l; Wed, 1 Nov 2023 22:46:23 +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 4SLMYq6S6Vz4MZk; Wed, 1 Nov 2023 22:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698878783; 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=4I7wqhXE06pQAUMXcxFJCQX85dYsTtugkq3hG7epXlI=; b=n7rmq2ea/OyOKyvdpGnFmNp5hT8yaezEi65JqGXLwekf5tIjmmXK4Z3KQlYIZERDK4a98e mqrrPusqZ9OUFizIVHKYxi4OnSxFpJBOb6uDfvXzDMW6bwGZESDaP7KOI7QS0O7TtFvjSM EEOTiAxjY8C3khZH1fjwKNhtQPgPPT3WDvvLU5MEEELWEvigiKDkns6P6Q6gPk8+aR0Ss/ ZnHZxtSIV7cuhekjRXSgiumVu7IucffgRoO2ehI3U/fG8+dr6AVmJJBoMAbUhW32EB5rmW crLt1VDdOxb7ugITlRWALPynLwXbn4NitsRrSOs01SSt9ZNpOl3Gu6dv+q8i3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698878783; 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=4I7wqhXE06pQAUMXcxFJCQX85dYsTtugkq3hG7epXlI=; b=Mo4AIVOQmVkEu4gb5Sg5UoGYZ7hc1bAZvV9EkhsfZo9a7iHwuwj9mW5TGi5F21iWh/e1gr zyp/5CbOHPWOg6UGjGkyLfBIiYEOrDKbAmWROMwsxGfjq9AuefbBc0QZL7P+wagT7GWrVn vlLVDog0yGMZRJ3ODYm6TNcHk/27+d+2ub5KwWN4ROsj8fMFFN38EIXWh1dsV5045rExGX xJy/d/7Uhq61maCI2MLEu05jpDUIecOKLZ3ULOsnJDX4EWloGSTmC1Funm/Z+GNrsJSMAX mQi2Qfnj40vPo/EyGcp2RwMZRn0XaahDtQOCPV/rsCq2d0dSODjo9JOQI2KErw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698878783; a=rsa-sha256; cv=none; b=V1tOf7aVntM/sCKaivMnX9WcTJFT5olK61Z2iiQ72kqLvkzyXorPWzjxAF8bhL4Ay7nZYd lFEGuiozrb0e8I6jp/TG9dNhAtAHffTYlYwKN+eZYpkgVgMn/T9jUX/2uWPnt1qf/MjiI3 rEyLnIJyXy7Su1MK/NHxznyxwjjfTuHJC78PKF5/T3jNCPLvC9B7z0VS/d0dsxNpvMkKrH FXmYIIAxvqVPVM8aMkLnpRBZIjYswIA9ZQ7FA0fsllctkXSwsBXCinvQHeykaqH26lOyko /Ces15wYCl0aptCtsmNCMccl4WCuvqtqjI3TvU5qaUmVS3RzH0hdKGdUPnyQRQ== 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 4SLMYq5VPFz14Mx; Wed, 1 Nov 2023 22:46:23 +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 3A1MkNN0033137; Wed, 1 Nov 2023 22:46:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A1MkNAk033134; Wed, 1 Nov 2023 22:46:23 GMT (envelope-from git) Date: Wed, 1 Nov 2023 22:46:23 GMT Message-Id: <202311012246.3A1MkNAk033134@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: 628fb375a5d4 - main - editors/libreoffice: revert previous fix for building 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 628fb375a5d431df300ba95bde17757b94e9d17a Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=628fb375a5d431df300ba95bde17757b94e9d17a commit 628fb375a5d431df300ba95bde17757b94e9d17a Author: Dimitry Andric AuthorDate: 2023-11-01 22:23:00 +0000 Commit: Dimitry Andric CommitDate: 2023-11-01 22:44:37 +0000 editors/libreoffice: revert previous fix for building with lld 17 This reverts commit 6338934b7c42825d661bca04efbaef58f9439c70: 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, 2 insertions(+), 13 deletions(-) diff --git a/editors/libreoffice/files/patch-solenv_gbuild_platform_unxgcc.mk b/editors/libreoffice/files/patch-solenv_gbuild_platform_unxgcc.mk index bb88c812c0eb..3bac7767ea5d 100644 --- a/editors/libreoffice/files/patch-solenv_gbuild_platform_unxgcc.mk +++ b/editors/libreoffice/files/patch-solenv_gbuild_platform_unxgcc.mk @@ -1,17 +1,6 @@ ---- solenv/gbuild/platform/unxgcc.mk.orig 2023-09-22 19:07:01 UTC +--- solenv/gbuild/platform/unxgcc.mk.orig 2022-12-22 00:14:09 UTC +++ solenv/gbuild/platform/unxgcc.mk -@@ -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 := \ +@@ -55,8 +55,7 @@ gb_CXXFLAGS := \ gb_CXXFLAGS := \ $(gb_CXXFLAGS_COMMON) \ -fPIC \