From owner-svn-ports-all@freebsd.org Wed Sep 30 20:52:18 2020 Return-Path: Delivered-To: svn-ports-all@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 2C947430D51; Wed, 30 Sep 2020 20:52:18 +0000 (UTC) (envelope-from girgen@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 4C1pNL0QbQz3XXj; Wed, 30 Sep 2020 20:52:18 +0000 (UTC) (envelope-from girgen@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 E69FB256FA; Wed, 30 Sep 2020 20:52:17 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08UKqHTl093397; Wed, 30 Sep 2020 20:52:17 GMT (envelope-from girgen@FreeBSD.org) Received: (from girgen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08UKqH09093395; Wed, 30 Sep 2020 20:52:17 GMT (envelope-from girgen@FreeBSD.org) Message-Id: <202009302052.08UKqH09093395@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: girgen set sender to girgen@FreeBSD.org using -f From: Palle Girgensohn Date: Wed, 30 Sep 2020 20:52:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r550749 - in head/databases: postgresql11-server postgresql12-server postgresql13-server X-SVN-Group: ports-head X-SVN-Commit-Author: girgen X-SVN-Commit-Paths: in head/databases: postgresql11-server postgresql12-server postgresql13-server X-SVN-Commit-Revision: 550749 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2020 20:52:18 -0000 Author: girgen Date: Wed Sep 30 20:52:17 2020 New Revision: 550749 URL: https://svnweb.freebsd.org/changeset/ports/550749 Log: Try to fix build on recent FreeBSD versions where clang version > llvm default ports version. Fix this by depending on a higher version of llvm if such a version exixts, and otherwise use a clang version compatible with the latest llvm. Using llvm was previously dependant on clang being used, and this did not quite work for all cases due to some weird order of variables in the Makefile. The result was that the option set by the used was not really honored. The portrevision is bumped to reflect that the setting of LLVM might not have worked before this portrevison. PR: 244403 Modified: head/databases/postgresql11-server/Makefile head/databases/postgresql12-server/Makefile head/databases/postgresql13-server/Makefile Modified: head/databases/postgresql11-server/Makefile ============================================================================== --- head/databases/postgresql11-server/Makefile Wed Sep 30 20:32:33 2020 (r550748) +++ head/databases/postgresql11-server/Makefile Wed Sep 30 20:52:17 2020 (r550749) @@ -4,7 +4,7 @@ DISTVERSION?= 11.9 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 0 +PORTREVISION?= 1 MAINTAINER?= pgsql@FreeBSD.org Modified: head/databases/postgresql12-server/Makefile ============================================================================== --- head/databases/postgresql12-server/Makefile Wed Sep 30 20:32:33 2020 (r550748) +++ head/databases/postgresql12-server/Makefile Wed Sep 30 20:52:17 2020 (r550749) @@ -4,7 +4,7 @@ DISTVERSION?= 12.4 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 0 +PORTREVISION?= 1 MAINTAINER?= pgsql@FreeBSD.org Modified: head/databases/postgresql13-server/Makefile ============================================================================== --- head/databases/postgresql13-server/Makefile Wed Sep 30 20:32:33 2020 (r550748) +++ head/databases/postgresql13-server/Makefile Wed Sep 30 20:52:17 2020 (r550749) @@ -101,10 +101,10 @@ OPTIONS_DEFINE+= LLVM OPTIONS_DEFAULT+= LLVM LLVM_DESC= Build with support for JIT-compiling expressions LLVM_CONFIGURE_WITH= llvm -LLVM_BUILD_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} -LLVM_BUILD_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -LLVM_RUN_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -LLVM_CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} +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 .endif @@ -193,12 +193,6 @@ USES+= compiler:gcc-c++11-lib USES+= compiler .endif -.if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11 -. if defined(SERVER_ONLY) && ${PORT_OPTIONS:MLLVM} -INSTALL_DIRS+= src/backend/jit/llvm -. endif -.endif - .if ${DISTVERSION:C/([0-9]*).*/\1/} < 10 . if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum) USES+= autoreconf @@ -245,11 +239,29 @@ CONFIGURE_ARGS+=--with-krb5 # For testing files in FILESDIR .include -# Fix problems building on FreeBSD 13 by keeping clang and llvm versions in sync -.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109 -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT} -CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT} +# sync LLVM to the preferred compiler if possible +# or else use a lower version compiler that is compatible +.if ${COMPILER_VERSION} > ${LLVM_DEFAULT} +# Highest LLVM version in ports: +. if ${COMPILER_VERSION} <= 11 +PG_LLVM_VERSION=${COMPILER_VERSION} +PG_COMPILER_VERSION=${COMPILER_VERSION} +. else +PG_LLVM_VERSION=11 +PG_COMPILER_VERSION=11 +. endif +.else +PG_COMPILER_VERSION=${COMPILER_VERSION} +PG_LLVM_VERSION=${LLVM_DEFAULT} +.endif + +.if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11 +. if defined(SERVER_ONLY) && ${PORT_OPTIONS:MLLVM} +INSTALL_DIRS+= src/backend/jit/llvm +. if ${COMPILER_VERSION} != ${PG_COMPILER_VERSION} +LLVM_CONFIGURE_ARGS?= CC=${LOCALBASE}/bin/clang${PG_COMPILER_VERSION} +. endif +. endif .endif .if defined(SERVER_ONLY)