From nobody Wed Apr 3 22:40:59 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V908W6YPdz5G2vB; Wed, 3 Apr 2024 22:40:59 +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 4V908W5P7mz4f5G; Wed, 3 Apr 2024 22:40:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712184059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ckZtktegysSfSzSk0i1cBRE6qKwSex4HG6vG2DTxj0o=; b=UUJLjkcOIexwfCKHIhhNkgtG4eqqUVPcblEzNps5TBz3/jFWUIGQHdDDW0yHjFxf6QTO7W 8UuI/ot5P+gD6WeLRLsTIbo3ILNzRi8yic2oveq+Kmb3pJ3qJ+zu3P2v5UGwpA/G4AZBuK ep7oUYDJDaB6RE6mPTTPo3ZE9/h1SeSoFlUvvSOqvJQhPnx76EWa/8Ug5p5Wrkg21v/W1p DOfUjiRx5LQEPtDmq5zWSwEg0/iyprQZJNakuQCVFZ7xIK0Z97jdWcAyY3Zhb6SAnqrrPM Ek0ZdQgxK9qYKIp8CchKjD4+ScefJpDzcVk7/TQsLSlLmIlRmI+4lrzq31EZrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712184059; a=rsa-sha256; cv=none; b=JS8lzS5f2NugCs7M9eIbq7SlmMM628lYXQ4bzbMjHVpGWzUfcRTqdiN0e++Kq1qolrKQmn MchKc+wnLGuZ7JuWE+MxagM1d7C9G8BNoOKNO1hA7XLOHGTfjKp6B2F0ixRN3m1lF+zZAm SWz4J8u5ibR+RT1xpzi+ukPosIhwr9FbEvY2a8xAyvbBLnAfosEKrgggg7VyLlpxdhn8iM NFsmsHZkrW+x7hFFkuxFZ4QWVxImg4DrMZAYG7/Se1fvZ/fnSWWfJVe1n+0POMKR5AeuUg ZFD4Cm5ZZgOKXa1HmIK/9e/d6lgX4mYKCpm0Tj9mHR9flgeOADkr5LbMSCKFUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712184059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ckZtktegysSfSzSk0i1cBRE6qKwSex4HG6vG2DTxj0o=; b=sItXOkgeh27dugQIdYHBDGVbpwoOBawkoZQGiApoLR69qCFsYMZgGo/kYNQr+J/IckZEzi EEXvzc5SMdhqfqEg9bDFtR7jyNKXCFUs9IWGf2SxIOSg95cxpFukxinPmxIE0CrgAA8DWN vYucdL35cdlMg0p36ga/TnDiVvqrxqN1oNy2YJ+f1tIgnzj4j7q29DSG4iscKWSeST/99E WdYJioIs/ynbn21Jt+06MNB46Ngj8r9HrDiw0h7OxTR63mjDOujUUblyt/zjHHD//et8k2 gb9SQ2kO6yni5b8uE0SeJkcCgc94OJJj9MvC9vupa5lypSaGYqmT1lPMzS/GgQ== 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 4V908W51KMzrQ1; Wed, 3 Apr 2024 22:40:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 433MexvW049575; Wed, 3 Apr 2024 22:40:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433MexSM049572; Wed, 3 Apr 2024 22:40:59 GMT (envelope-from git) Date: Wed, 3 Apr 2024 22:40:59 GMT Message-Id: <202404032240.433MexSM049572@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: 2986fba67c34 - main - devel/llvm-devel: handle the edge case where FLANG is on and OPENMP is off List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2986fba67c34cc693e18344beb0cb71094bb8149 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=2986fba67c34cc693e18344beb0cb71094bb8149 commit 2986fba67c34cc693e18344beb0cb71094bb8149 Author: Brooks Davis AuthorDate: 2024-04-03 22:40:27 +0000 Commit: Brooks Davis CommitDate: 2024-04-03 22:40:27 +0000 devel/llvm-devel: handle the edge case where FLANG is on and OPENMP is off PR: 277989 Submitted by: Trond Endrestøl --- devel/llvm-devel/Makefile | 2 +- devel/llvm-devel/pkg-plist | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index dc5b114dce26..c5ab4ea63af3 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -290,7 +290,7 @@ LLVM_ENABLE_PROJECTS+= openmp MAN1SRCS+= ${OPENMP_MAN1SRCS} COMMANDS+= ${OPENMP_COMMANDS} .endif -OPENMP_PATTERN= ${OPENMP_COMMANDS:tW:C/ */|/g}|cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|ompx.h|omp-tools.h +OPENMP_PATTERN= ${OPENMP_COMMANDS:tW:C/ */|/g}|cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|ompx.h|omp-tools.h|omp_lib .if ${PORT_OPTIONS:MPOLLY} LLVM_ENABLE_PROJECTS+= polly diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist index 82e585ffa0f8..acd7e07fb758 100644 --- a/devel/llvm-devel/pkg-plist +++ b/devel/llvm-devel/pkg-plist @@ -1595,7 +1595,7 @@ llvm-devel/bin/verify-uselistorder %%FLANG%%llvm-devel/include/flang/Lower/Support/Verifier.h %%FLANG%%llvm-devel/include/flang/Lower/SymbolMap.h %%FLANG%%llvm-devel/include/flang/Lower/VectorSubscripts.h -%%FLANG%%llvm-devel/include/flang/OpenMP/omp_lib.h +%%FLANG%%%%OPENMP%%llvm-devel/include/flang/OpenMP/omp_lib.h %%FLANG%%llvm-devel/include/flang/Optimizer/Analysis/AliasAnalysis.h %%FLANG%%llvm-devel/include/flang/Optimizer/Analysis/TBAAForest.h %%FLANG%%llvm-devel/include/flang/Optimizer/Builder/BoxValue.h @@ -1792,10 +1792,10 @@ llvm-devel/bin/verify-uselistorder %%FLANG%%llvm-devel/include/flang/iso_fortran_env.mod %%FLANG%%llvm-devel/include/flang/mma.f18.mod %%FLANG%%llvm-devel/include/flang/mma.mod -%%FLANG%%llvm-devel/include/flang/omp_lib.f18.mod -%%FLANG%%llvm-devel/include/flang/omp_lib.mod -%%FLANG%%llvm-devel/include/flang/omp_lib_kinds.f18.mod -%%FLANG%%llvm-devel/include/flang/omp_lib_kinds.mod +%%FLANG%%%%OPENMP%%llvm-devel/include/flang/omp_lib.f18.mod +%%FLANG%%%%OPENMP%%llvm-devel/include/flang/omp_lib.mod +%%FLANG%%%%OPENMP%%llvm-devel/include/flang/omp_lib_kinds.f18.mod +%%FLANG%%%%OPENMP%%llvm-devel/include/flang/omp_lib_kinds.mod %%LLD%%llvm-devel/include/lld/Common/Args.h %%LLD%%llvm-devel/include/lld/Common/Arrays.h %%LLD%%llvm-devel/include/lld/Common/CommonLinkerContext.h