pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

llvm-git: Sync options.mk with pkgsrc



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat May 13 23:46:48 2017 +0200
Changeset:	fbbbf8db6ef0c3e81e1ae7676b65d18c9cd5df9e

Modified Files:
	llvm-git/options.mk

Log Message:
llvm-git: Sync options.mk with pkgsrc

Sponsored by <The NetBSD Foundation>

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fbbbf8db6ef0c3e81e1ae7676b65d18c9cd5df9e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 llvm-git/options.mk | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diffs:
diff --git a/llvm-git/options.mk b/llvm-git/options.mk
index bdb11ec742..f8b4bdf022 100644
--- a/llvm-git/options.mk
+++ b/llvm-git/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD$
+# $NetBSD: options.mk,v 1.3 2017/05/09 12:23:42 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.llvm
 
@@ -8,6 +8,17 @@ LLVM_TARGETS=	AArch64 AMDGPU ARM BPF Hexagon MSP430 Mips NVPTX PowerPC Sparc Sys
 PLIST_VARS+=			${tgt}
 PKG_SUPPORTED_OPTIONS+=		llvm-target-${tgt:tl}
 .endfor
+PKG_SUPPORTED_OPTIONS+=		terminfo
+
+# Terminfo is used for colour output, only enable it by default if terminfo
+# is builtin to avoid unnecessary dependencies which could cause bootstrap
+# issues.
+CHECK_BUILTIN.terminfo:=	yes
+.include "../../mk/terminfo.builtin.mk"
+CHECK_BUILTIN.terminfo:=	no
+.if !empty(USE_BUILTIN.terminfo:M[yY][eE][sS])
+PKG_SUGGESTED_OPTIONS+=		terminfo
+.endif
 
 # Probably safe to assume that only x86 users are interested in
 # cross-compilation for now. This saves some build time for everyone else.
@@ -35,4 +46,10 @@ LLVM_TARGETS_TO_BUILD+=	${tgt}
 .  endif
 .endfor
 
+.if !empty(PKG_OPTIONS:Mterminfo)
+.include "../../mk/terminfo.buildlink3.mk"
+.else
+CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=OFF
+.endif
+
 CMAKE_ARGS+=	-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS_TO_BUILD:ts;}"


Home | Main Index | Thread Index | Old Index