Date: Mon, 18 Dec 2023 09:01:17 GMT From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f25b169ac895 - main - editors/openoffice-*: Unbreak build on 15.0-CURRENT Message-ID: <202312180901.3BI91HCR063307@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=f25b169ac89578f18a6e480d4d84284bb8085316 commit f25b169ac89578f18a6e480d4d84284bb8085316 Author: Don Lewis <truckman@FreeBSD.org> AuthorDate: 2023-12-18 08:52:02 +0000 Commit: Don Lewis <truckman@FreeBSD.org> CommitDate: 2023-12-18 08:56:38 +0000 editors/openoffice-*: Unbreak build on 15.0-CURRENT clang version 17.0.6 causes linker errors that break the build on 15.0-CURRENT. Work around this by building with an older llvm from ports. PR: 275820 --- editors/openoffice-4/Makefile | 8 ++++++++ editors/openoffice-devel/Makefile | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 39d192072f3e..05a8bc8e9eca 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -198,6 +198,14 @@ TARGET_ORDER_OVERRIDE= 710:gnome-post-icons WITH= SDK .endif +.include <bsd.port.options.mk> + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500005 +# linker error when compiling with llvm 17.0.6 on CURRENT +USES+= llvm:max=16 +CHOSEN_COMPILER_TYPE= clang +.endif + .include <bsd.port.pre.mk> .if ${OPSYS} == FreeBSD && ( \ diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 79d9cbcea32d..c6b574bf6cd2 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -230,6 +230,14 @@ TARGET_ORDER_OVERRIDE= 710:gnome-post-icons WITH= SDK .endif +.include <bsd.port.options.mk> + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500005 +# linker error when compiling with llvm 17.0.6 on CURRENT +USES+= llvm:max=16 +CHOSEN_COMPILER_TYPE= clang +.endif + .include <bsd.port.pre.mk> .if ${OPSYS} == FreeBSD && ( \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312180901.3BI91HCR063307>