From owner-svn-ports-head@freebsd.org Fri Mar 6 10:12:20 2020 Return-Path: Delivered-To: svn-ports-head@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 829EF264A44; Fri, 6 Mar 2020 10:12:20 +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 48Yk1v4qq3z4ZGv; Fri, 6 Mar 2020 10:12:19 +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 2F26E1E923; Fri, 6 Mar 2020 10:12:19 +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 026ACJdi058784; Fri, 6 Mar 2020 10:12:19 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 026ACJ1M058783; Fri, 6 Mar 2020 10:12:19 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202003061012.026ACJ1M058783@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:12:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527871 - head/databases/postgresql12-server X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/databases/postgresql12-server X-SVN-Commit-Revision: 527871 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Mar 2020 10:12:20 -0000 Author: pkubaj Date: Fri Mar 6 10:12:18 2020 New Revision: 527871 URL: https://svnweb.freebsd.org/changeset/ports/527871 Log: databases/postgresql12-server: fix build on GCC architectures Use LLVM only if Clang is used. PR: 244225 Approved by: pgsql (maintainer timeout) MFH: 2020Q1 (fix build blanket) Modified: head/databases/postgresql12-server/Makefile Modified: head/databases/postgresql12-server/Makefile ============================================================================== --- head/databases/postgresql12-server/Makefile Fri Mar 6 10:02:29 2020 (r527870) +++ head/databases/postgresql12-server/Makefile Fri Mar 6 10:12:18 2020 (r527871) @@ -94,7 +94,8 @@ 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_DEFAULT+= LLVM +OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${CHOSEN_COMPILER_TYPE}} +OPTIONS_DEFAULT_clang= LLVM .endif .if ${DISTVERSION:C/([0-9]*).*/\1/} < 10 @@ -173,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