Date: Wed, 1 Nov 2023 22:46:23 GMT From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 628fb375a5d4 - main - editors/libreoffice: revert previous fix for building with lld 17 Message-ID: <202311012246.3A1MkNAk033134@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=628fb375a5d431df300ba95bde17757b94e9d17a commit 628fb375a5d431df300ba95bde17757b94e9d17a Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2023-11-01 22:23:00 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> 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 <dim@FreeBSD.org> --- .../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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311012246.3A1MkNAk033134>