From nobody Tue Aug 08 14:54:51 2023 X-Original-To: dev-commits-ports-main@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 4RKx701TXSz4mRr8; Tue, 8 Aug 2023 14:54:52 +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 4RKx6z6Xyxz3VF6; Tue, 8 Aug 2023 14:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691506491; 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=hRqEAZa0+zCzCjDkJniEQIFllIIGMbCe82+y5OHAqtU=; b=Rv6ss/RcB4K7zr0o5BBLxrkKivAZqj9ho1VBeH6SySoFH9a0QjKaiOmmBqaN+VEYTKEbBe 8SD4bGr0SAbOqsT8PUBl9szCu677D4vZW57ZTHclfnVN6ugg6+e2SAzjqBY/3haqfcfsyb 3TzAyPmWCiu+l+X+2cb6rn+GzbnCmJqglJGRL9JEATZrxFhOv9AORO98709qEDaPbupO/+ QPxRMW+XkmfWqGQ2r8W46w2FPokHxqmnL4PNUzfunVrG8CXSWISs6UU2y4Hbx0PUcBk9EQ ICQPrwjc9NV5cxYoiT9izFAYsHsfvF3GkgFSUnWt2nE7Se11k3JYJUy/+QTASw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691506491; 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=hRqEAZa0+zCzCjDkJniEQIFllIIGMbCe82+y5OHAqtU=; b=SVTiS+S4SUvYetd1PziQ6ai0fPd/7gU3b0SKySHAhXZTiMfRybHTl+NlW8KvUKJQgQo8Zo yhy46fOE9+jJzI3zfPSxpjed8kihV7X5q7vMjnJ81Lq3lv6mlOaE5yY3tlWHe+Lp7J6Enk JAfOfzRkHdpyFhbfart0x0I8hUozFOXBMftBuvlX87FCyz224lf5Uay1RVyfECYpC0GGXc eOtQwUqfb/+aVXm3S+PR/Rriy+W1e9nnPjRFRSoO6F/eILtRaI6AlVs+nsyr3b8Dhv0wEC x+jsJofGcgyiUc+wMQe+2QJZ6HLbe0LRRF5/padhQttFJ6qOuaviyUVaWWXegA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691506491; a=rsa-sha256; cv=none; b=lQZ4o+BrHVBIgkmwMbiBqVgLoqKpjBD3Y8bbKy/5LjqO791ysogVQgNUYgWbPiFaSTA44Y ch/E0aTyx8PIhJiXV3dOAWSk5DmjXsEQnYZ2KUqERwjI96bLzG3Hy3ULnXjpJBI4FkodWY t3qdrBmnKh8ghFz0QX7vUhL9Rix6pGrUoJHrv519xve1PnUzL3LArugsaAraAF778rIPcK qF8n6OrMA47njLHFzN1fSPruwUVPc0WzqlSNvPbKMcDh88iwRJkQxePET7M9eiB+9lVkJ9 C3kWFvtp1XOJq8SrjOWjoUo8odOli62S3nIeSvYl3ASpWd+k8Oavo/HESoAbxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RKx6z5Q4yzdj5; Tue, 8 Aug 2023 14:54:51 +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 378EspuP073440; Tue, 8 Aug 2023 14:54:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378EspjH073439; Tue, 8 Aug 2023 14:54:51 GMT (envelope-from git) Date: Tue, 8 Aug 2023 14:54:51 GMT Message-Id: <202308081454.378EspjH073439@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: e91543469143 - main - devel/llvm-devel: Fix plist List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: e91543469143ce0fe5f436b22b1afb75e1302e0b Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=e91543469143ce0fe5f436b22b1afb75e1302e0b commit e91543469143ce0fe5f436b22b1afb75e1302e0b Author: Brooks Davis AuthorDate: 2023-08-07 17:56:18 +0000 Commit: Brooks Davis CommitDate: 2023-08-08 14:54:33 +0000 devel/llvm-devel: Fix plist Newly added ompx.h was incorreclty tagged as being part of CLANG not OPENMP. This broke systems without OPENMP (all 32-bit systems). --- devel/llvm-devel/Makefile | 2 +- devel/llvm-devel/pkg-plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 7080c4cdfce5..eaa08f287be7 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -292,7 +292,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|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 .if ${PORT_OPTIONS:MPOLLY} LLVM_ENABLE_PROJECTS+= polly diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist index 63d6de00b94c..db34236d5d5e 100644 --- a/devel/llvm-devel/pkg-plist +++ b/devel/llvm-devel/pkg-plist @@ -5738,7 +5738,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h %%OPENMP%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/omp.h %%OPENMP%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/ompt-multiplex.h %%OPENMP%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/ompt.h -%%CLANG%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/ompx.h +%%OPENMP%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/ompx.h %%CLANG%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/opencl-c-base.h %%CLANG%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/opencl-c.h %%CLANG%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/openmp_wrappers/__clang_openmp_device_functions.h