From owner-svn-ports-branches@freebsd.org Fri Mar 6 10:14:46 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 75F8C264BA6; Fri, 6 Mar 2020 10:14:46 +0000 (UTC) (envelope-from pkubaj@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48Yk4k17csz4gBS; Fri, 6 Mar 2020 10:14:46 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F30BA1E947; Fri, 6 Mar 2020 10:14:45 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 026AEjE6059999; Fri, 6 Mar 2020 10:14:45 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 026AEjBC059998; Fri, 6 Mar 2020 10:14:45 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202003061014.026AEjBC059998@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Fri, 6 Mar 2020 10:14:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r527872 - branches/2020Q1/databases/postgresql12-server X-SVN-Group: ports-branches X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: branches/2020Q1/databases/postgresql12-server X-SVN-Commit-Revision: 527872 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Mar 2020 10:14:46 -0000 Author: pkubaj Date: Fri Mar 6 10:14:45 2020 New Revision: 527872 URL: https://svnweb.freebsd.org/changeset/ports/527872 Log: MFH: r527871 databases/postgresql12-server: fix build on GCC architectures Use LLVM only if Clang is used. PR: 244225 Approved by: pgsql (maintainer timeout) Approved by: portmgr (fix build blanket) Modified: branches/2020Q1/databases/postgresql12-server/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/databases/postgresql12-server/Makefile ============================================================================== --- branches/2020Q1/databases/postgresql12-server/Makefile Fri Mar 6 10:12:18 2020 (r527871) +++ branches/2020Q1/databases/postgresql12-server/Makefile Fri Mar 6 10:14:45 2020 (r527872) @@ -92,8 +92,10 @@ TZDATA_DESC= Use internal timezone database XML_DESC= Build with XML data type .if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11 -OPTIONS_DEFINE+=LLVM -LLVM_DESC= Build with support for JIT-compiling expressions +OPTIONS_DEFINE+= LLVM +LLVM_DESC= Build with support for JIT-compiling expressions +OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${CHOSEN_COMPILER_TYPE}} +OPTIONS_DEFAULT_clang= LLVM .endif .if ${DISTVERSION:C/([0-9]*).*/\1/} < 10 @@ -172,6 +174,8 @@ SUB_LIST+= PG_GROUP=${PG_GROUP} \ .if ${ARCH} == "i386" USES+= compiler:gcc-c++11-lib +.else +USES+= compiler .endif .if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11