Skip to content

Commit

Permalink
editors/openoffice-*: Unbreak build on 15.0-CURRENT
Browse files Browse the repository at this point in the history
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
  • Loading branch information
DonLewisFreeBSD committed Dec 18, 2023
1 parent 682965a commit f25b169
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
8 changes: 8 additions & 0 deletions editors/openoffice-4/Makefile
Expand Up @@ -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 && ( \
Expand Down
8 changes: 8 additions & 0 deletions editors/openoffice-devel/Makefile
Expand Up @@ -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 && ( \
Expand Down

0 comments on commit f25b169

Please sign in to comment.