From owner-svn-ports-branches@freebsd.org Wed Oct 21 19:07:18 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 ECC7642AE1E; Wed, 21 Oct 2020 19:07:18 +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) 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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CGg3V1MP9z4dpS; Wed, 21 Oct 2020 19:07:18 +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 EC164A80F; Wed, 21 Oct 2020 19:07:17 +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 09LJ7HRQ093351; Wed, 21 Oct 2020 19:07:17 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09LJ7HPh093350; Wed, 21 Oct 2020 19:07:17 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202010211907.09LJ7HPh093350@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Wed, 21 Oct 2020 19:07:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r552883 - branches/2020Q4/databases/postgresql13-server X-SVN-Group: ports-branches X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: branches/2020Q4/databases/postgresql13-server X-SVN-Commit-Revision: 552883 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.33 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: Wed, 21 Oct 2020 19:07:19 -0000 Author: pkubaj Date: Wed Oct 21 19:07:17 2020 New Revision: 552883 URL: https://svnweb.freebsd.org/changeset/ports/552883 Log: MFH: r551634 r551663 r551702 r552356 databases/postgresql13-server: fix build on GCC architectures Add the previously removed disabling of LLVM when it's not in base. databases/postgresql13-server: fix build on clang architectures Move LLVM option configuration after including bsd.port.options.mk. Reported by: kib@ databases/postgresql13-server: make LLVM option unselectable This will still keep this port and its slaves buildable on the package builder on powerpc64, and I doubt anyone uses it on mips*. Reported by: kib@, adamw@ Fix options breakage from r551702. Make LLVM option work again on everything but powerpc64. PR: 250346 Submitted by: Christian Ullrich Approved by: portmgr (fix build blanket) Modified: branches/2020Q4/databases/postgresql13-server/Makefile Directory Properties: branches/2020Q4/ (props changed) Modified: branches/2020Q4/databases/postgresql13-server/Makefile ============================================================================== --- branches/2020Q4/databases/postgresql13-server/Makefile Wed Oct 21 19:06:43 2020 (r552882) +++ branches/2020Q4/databases/postgresql13-server/Makefile Wed Oct 21 19:07:17 2020 (r552883) @@ -100,13 +100,8 @@ DTRACE_INSTALL_TARGET= install OPTIONS_DEFINE+= LLVM OPTIONS_DEFAULT+= LLVM LLVM_DESC= Build with support for JIT-compiling expressions -LLVM_CONFIGURE_WITH= llvm -LLVM_BUILD_DEPENDS= llvm${PG_LLVM_VERSION}>0:devel/llvm${PG_LLVM_VERSION} -LLVM_BUILD_DEPENDS+= llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION} -LLVM_RUN_DEPENDS+= llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION} -LLVM_CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${PG_LLVM_VERSION} -#OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${CHOSEN_COMPILER_TYPE}} -#OPTIONS_DEFAULT_clang= LLVM +OPTIONS_EXCLUDE+= ${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}} +OPTIONS_EXCLUDE_powerpc64_12= LLVM .endif .if ${DISTVERSION:C/([0-9]*).*/\1/} < 10 @@ -238,6 +233,14 @@ CONFIGURE_ARGS+=--with-krb5 # For testing files in FILESDIR .include + +.if ${PORT_OPTIONS:MLLVM} +CONFIGURE_ARGS+= --with-llvm +BUILD_DEPENDS+= llvm${PG_LLVM_VERSION}>0:devel/llvm${PG_LLVM_VERSION} +BUILD_DEPENDS+= llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION} +RUN_DEPENDS+= llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION} +CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${PG_LLVM_VERSION} +.endif # sync LLVM to the preferred compiler if possible # or else use a lower version compiler that is compatible