Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 Apr 2021 22:23:42 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: 449e5da21ccc - main - llvm-devel: enable flang by default
Message-ID:  <202104082223.138MNgTH082496@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=449e5da21ccc0b8bf5175ad579a2ba3a3b217406

commit 449e5da21ccc0b8bf5175ad579a2ba3a3b217406
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2021-04-08 22:23:37 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2021-04-08 22:23:37 +0000

    llvm-devel: enable flang by default
    
    The flang Fortran compiler now builds with LLVM_LINK_LLVM_DYLIB=ON
    (required to avoid truely excessive size) so enable it by default.
---
 devel/llvm-devel/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 82d7934030f6..875a1c57e84b 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	llvm
 PORTVERSION=	${LLVM_MAJOR}.0.d${SNAPDATE}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-devel
 
@@ -42,6 +42,7 @@ SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
 CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}
 CMAKE_SOURCE_PATH=	${WRKSRC}/llvm
 CMAKE_ARGS=	-DLLVM_BUILD_LLVM_DYLIB=ON
+CMAKE_ARGS+=	-DLLVM_LINK_LLVM_DYLIB=ON
 CMAKE_ARGS+=	-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON
 CMAKE_ARGS+=	-DLLVM_ENABLE_RTTI=ON
 CMAKE_ARGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=${CONFIGURE_TARGET}
@@ -74,7 +75,7 @@ OPTIONS_DEFINE=	CLANG DOCS EXTRAS FLANG LIT LLD LLDB MLIR
 OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
 OPTIONS_DEFINE_powerpc64=	GOLD OPENMP
-OPTIONS_DEFAULT=	CLANG EXTRAS LIT LLD LLDB MLIR
+OPTIONS_DEFAULT=	CLANG EXTRAS FLANG LIT LLD LLDB MLIR
 OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
 OPTIONS_DEFAULT_powerpc64=     ${OPTIONS_DEFAULT_powerpc64_${OSREL:R}} OPENMP
@@ -128,8 +129,6 @@ FLANG_IMPLIES=		MLIR
 FLANG_PLIST_DIRS=	${LLVM_PREFIX:S|${PREFIX}/||}/include/flang/Config
 # Docs require sphinx-markdown-tables which requires py-markdown > 3.0.1
 FLANG_CMAKE_ON=		-DFLANG_INCLUDE_DOCS=OFF
-# flang is broken with DYLIB linkage
-FLANG_CMAKE_OFF=	-DLLVM_LINK_LLVM_DYLIB=ON
 LIT_DESC=		Install lit and FileCheck test tools
 LLD_DESC=		Install lld, the LLVM linker
 LLDB_BUILD_DEPENDS=	swig:devel/swig



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