From owner-dev-commits-ports-all@freebsd.org Fri Apr 23 16:14:07 2021 Return-Path: Delivered-To: dev-commits-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 1708E5F7FE0; Fri, 23 Apr 2021 16:14:07 +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 4FRfVl0CXkz4pcR; Fri, 23 Apr 2021 16:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 EE4C87FCB; Fri, 23 Apr 2021 16:14:06 +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 13NGE6Ac015936; Fri, 23 Apr 2021 16:14:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NGE6h2015935; Fri, 23 Apr 2021 16:14:06 GMT (envelope-from git) Date: Fri, 23 Apr 2021 16:14:06 GMT Message-Id: <202104231614.13NGE6h2015935@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 5390741fcfd8 - 2021Q2 - llvm12: rework handling undefined options MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 5390741fcfd802145f2cd2cdff5bceb292594f1e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 16:14:07 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=5390741fcfd802145f2cd2cdff5bceb292594f1e commit 5390741fcfd802145f2cd2cdff5bceb292594f1e Author: Brooks Davis AuthorDate: 2021-04-07 17:26:40 +0000 Commit: Jan Beich CommitDate: 2021-04-23 16:11:02 +0000 llvm12: rework handling undefined options Define a list of options and for any that aren't defined for the current architecture add a PLIST_SUB entry as through the option were defined and disabled. (cherry picked from commit c9a3a7442f64da0f932d4e6934218c1acd684d25) --- devel/llvm12/Makefile | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile index 67f4d5f2764e..7ef190aa2f48 100644 --- a/devel/llvm12/Makefile +++ b/devel/llvm12/Makefile @@ -90,6 +90,8 @@ OPTIONS_DEFAULT_powerpc64le= GOLD OPENMP OPTIONS_SINGLE= BACKENDS OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD OPTIONS_SUB= yes +# All non-backend options +_ALL_OPTIONS= CLANG COMPILER_RT DOCS EXTRAS GOLD LIT LLD LLDB PYCLANG OPENMP BE_AMDGPU_DESC= AMD GPU backend (required by mesa) BE_FREEBSD_DESC= Backends for FreeBSD architectures @@ -437,23 +439,12 @@ CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .endif -.if ! ${OPTIONS_DEFINE:MCOMPILER_RT} -# Hack to disable COMPILER_RT in plist of unsupported architectures -PLIST_SUB+= COMPILER_RT="@comment " -.else -.endif - -.if ! ${OPTIONS_DEFINE:MGOLD} -# Hack to disable GOLD in plist of unsupported architectures -PLIST_SUB+= GOLD="@comment " -.else -.endif - -.if ! ${OPTIONS_DEFINE:MOPENMP} -# Hack to disable OPENMP in plist of unsupported architectures -PLIST_SUB+= OPENMP="@comment " -.else +# Comment out plist entries for unsupported options. +.for opt in ${_ALL_OPTIONS} +.if !${OPTIONS_DEFINE:M${opt}} +PLIST_SUB+= ${opt}="@comment " .endif +.endfor post-patch: ${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \