From dbafe427a49b7feef6049e10e3398a0681c8ccd5 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 16 Mar 2022 19:28:57 +0100 Subject: databases/postgresql14-server: Avoid using llvm14 When the base system compiler is clang 14, the postgresql ports attempt to build against the devel/llvm14 port. This will fail with several compile errors as there are a few incompatible changes in the LLVM 14 C and C++ APIs. Until upstream postgresql adapts to these changes, limit the PG_LLVM_VERSION to a maximum of 13. PR: 261976 Approved by: maintainer timeout (2 weeks) MFH: 2022Q1 --- databases/postgresql14-server/Makefile | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'databases/postgresql14-server') diff --git a/databases/postgresql14-server/Makefile b/databases/postgresql14-server/Makefile index c55a077634ac..c8d97cafd294 100644 --- a/databases/postgresql14-server/Makefile +++ b/databases/postgresql14-server/Makefile @@ -266,15 +266,26 @@ LLVM_PORT_SUFFIX= ${COMPILER_VERSION:C/.$//} .if ${COMPILER_VERSION} > ${LLVM_DEFAULT_VERSION} # LLVM versions in ports are, in order, 70, 80 90, 10, 11, 12... where 10 > 90. [sic] . if ${LLVM_PORT_SUFFIX} < 70 +# PR 261976 postgresql fails to build with LLVM 14 +. if ${LLVM_PORT_SUFFIX} > 13 +PG_LLVM_VERSION=13 +PG_COMPILER_VERSION=13 +. else PG_LLVM_VERSION=${LLVM_PORT_SUFFIX} PG_COMPILER_VERSION=${LLVM_PORT_SUFFIX} +. endif . else PG_LLVM_VERSION=11 PG_COMPILER_VERSION=11 . endif .else +. if ${LLVM_PORT_SUFFIX} > 13 +PG_LLVM_VERSION=13 +PG_COMPILER_VERSION=13 +. else PG_LLVM_VERSION=${LLVM_DEFAULT} PG_COMPILER_VERSION=${LLVM_PORT_SUFFIX} +. endif .endif .if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11 -- cgit v1.2.3