Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 Nov 2022 18:59:54 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: 8fc9ee02cc73 - main - devel/llvm-devel: fix packaging without FLANG option
Message-ID:  <202211291859.2ATIxsDC056414@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=8fc9ee02cc73b52cfc0585fd52d858fd93f60edb

commit 8fc9ee02cc73b52cfc0585fd52d858fd93f60edb
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2022-11-29 18:59:49 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2022-11-29 18:59:49 +0000

    devel/llvm-devel: fix packaging without FLANG option
---
 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 2d7f8e37b2d5..b46cd7115a57 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -201,7 +201,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|libHLFIRDialect
+FLANG_PATTERN=	${FLANG_COMMANDS:S/^/bin./:tW:C/  */|/g}|flang|libFIR|libFortran|libHLFIR
 
 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 18f563f111fb..653be3792136 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -5419,7 +5419,7 @@ llvm-devel/lib/cmake/llvm/llvm-driver-template.cpp.in
 %%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libFortranSemantics.a
 %%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libFortran_main.a
 %%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libHLFIRDialect.a
-%%STATIC_LIBS%%llvm-devel/lib/libHLFIRTransforms.a
+%%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libHLFIRTransforms.a
 llvm-devel/lib/libLLVM-%%LLVM_MAJOR%%git.so
 llvm-devel/lib/libLLVM-%%LLVM_RELEASE%%git.so
 llvm-devel/lib/libLLVM.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202211291859.2ATIxsDC056414>