Date: Tue, 28 Nov 2023 00:28:39 GMT From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c3a33020c0e8 - main - devel/llvm-devel: fix plist without FLANG Message-ID: <202311280028.3AS0SdFf003628@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=c3a33020c0e8a681690fd9322ddb68481a62424a commit c3a33020c0e8a681690fd9322ddb68481a62424a Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2023-11-28 00:20:21 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2023-11-28 00:28:23 +0000 devel/llvm-devel: fix plist without FLANG ISO_Fortran_binding.h is installed in both clang and flang include paths. The clang one was inappropriately tagged as conditional on CLANG and not both. --- 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 d703a782c125..8ff822358edf 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -216,7 +216,7 @@ EXTRAS_LIBS= \ EXTRAS_FILES= index.js EXTRAS_PATTERN= ${EXTRAS_COMMANDS:tW:C/ */|/g}|${EXTRAS_LIBS:tW:C/ */|/g}|${EXTRAS_FILES:tW:C/ */|/g} -FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libFIR|libFortran|libHLFIR +FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libFIR|libFortran|libHLFIR|ISO_Fortran_binding.h MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist index 72014a1a72af..3873f2b25981 100644 --- a/devel/llvm-devel/pkg-plist +++ b/devel/llvm-devel/pkg-plist @@ -5814,7 +5814,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h %%POLLY%%llvm-devel/include/polly/isl/version.h %%POLLY%%llvm-devel/include/polly/isl/vertices.h %%POLLY%%llvm-devel/lib/LLVMPolly.so -%%CLANG%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/ISO_Fortran_binding.h +%%CLANG%%%%FLANG%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/ISO_Fortran_binding.h %%CLANG%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/__clang_cuda_builtin_vars.h %%CLANG%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/__clang_cuda_cmath.h %%CLANG%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/__clang_cuda_complex_builtins.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311280028.3AS0SdFf003628>