From f25b169ac89578f18a6e480d4d84284bb8085316 Mon Sep 17 00:00:00 2001 From: Don Lewis Date: Mon, 18 Dec 2023 00:52:02 -0800 Subject: [PATCH] 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 39d192072f3e2..05a8bc8e9ecac 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 + +.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 .if ${OPSYS} == FreeBSD && ( \ diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 79d9cbcea32d3..c6b574bf6cd24 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 + +.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 .if ${OPSYS} == FreeBSD && ( \