From nobody Wed Mar 16 18:38:01 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E8ACC1A2C111; Wed, 16 Mar 2022 18:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KJfCs612Yz4rr5; Wed, 16 Mar 2022 18:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647455881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zBQxoaPrQ7k377OX7Wl1RdtWMFD42r6l8JzR5zMHbNU=; b=HLg7eQ1dNMuxOpdjWfE/MO4GtcHrR4PJ8rLEIlcEMthwSTKRJW/8KicTAjOHFoyws8ZW+F Yp5iED0ehCYgDSp+Z9RvOwPcwxd5LEfo09PReMQQNmFuZmMlDJks2+r25udg73Oav4ffQw 6X6nwdLJZhKKg73b0e8/StAKgiirvj34D3qXbM5Be16Wxjif4TtyRmCHkzff64W+biHDME eK8xXhkI+WNE+fzLzgor1eFA2GRax1T37oDY3x8wuMfTPKMAnCDmVi9qOcxmqaafI2fI8P ejyZHdY0MfI/sMRAl9gB11afMbM5oqpYuzu69IXZn68eaI1CivT2ffnpSZPPhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AEC521B869; Wed, 16 Mar 2022 18:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22GIc1bx040793; Wed, 16 Mar 2022 18:38:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22GIc1Ku040792; Wed, 16 Mar 2022 18:38:01 GMT (envelope-from git) Date: Wed, 16 Mar 2022 18:38:01 GMT Message-Id: <202203161838.22GIc1Ku040792@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: dbafe427a49b - main - databases/postgresql14-server: Avoid using llvm14 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dbafe427a49b7feef6049e10e3398a0681c8ccd5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647455881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zBQxoaPrQ7k377OX7Wl1RdtWMFD42r6l8JzR5zMHbNU=; b=MEb5oIT12wuwjgldEZa47FRnMM/DWMQmryfL4+XgYS7iCN5Wd2HUnLDUA8CDmWXsfdlNcK gsvk75t1Ioas/ZQiZZC8BQrO3FZvviZH+yFnloYLRhswpY81AyeYT/eCDvHFuC7FljX1oE tIeywzKRv2cdYiKw7OB9TmuYXCisaztzdF6KYuMmwxU8mGHuhL15hfgTueODErdS2PeC+D +ddY9n4hvT7d3T5lzb1APQUq9uRrmdhWcp119WC12HvjIeaeuwED69kLQPRWLhDshqwsg8 uwmYEZqZLhOEzkygYrpnwnuZJk/hubzDu5ryn+86s8COs0kwzQTTeci8WG4H2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647455881; a=rsa-sha256; cv=none; b=BQiS4omKsT+meAkDtb3w3UFp+h0wp7o+i6KfPTmu23MkpRkU1UR0L8RUjne0RgJHt2GK0Q t7fF4MtEdhl9JPHpUMXRLKMESpxm7aNkzal5FmvCZodeHkEwbJcFNAzUMK/xj/wi9rfCCX gZHVLcqW9DhrmfBmWaS3JdFBOH9ULz2ouZBYDjzB2YobGU0U+ZMNlunksOvzXKwwdtXYUS YO4OZbrlFPP+rdHx+Kc82M22pfkXnuPrEYThwCPfyLBFs6m2omysAz/j/+lsEbIfYenIa/ f6hmOOkRsccbAnHDgzUEtcfhaZFG11X1XWFAkYLOa2f85ZSQNtH6F8093B0Arw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=dbafe427a49b7feef6049e10e3398a0681c8ccd5 commit dbafe427a49b7feef6049e10e3398a0681c8ccd5 Author: Dimitry Andric AuthorDate: 2022-03-16 18:28:57 +0000 Commit: Dimitry Andric CommitDate: 2022-03-16 18:28:57 +0000 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(+) 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