CVS commit: pkgsrc/lang

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue May  9 12:23:42 UTC 2017

Modified Files:
        pkgsrc/lang/libLLVM: options.mk
        pkgsrc/lang/llvm: options.mk

Log Message:
Add a terminfo option and enable by default (and correctly pull terminfo in)
if terminfo is builtin, otherwise leave it as a user option to avoid possible
dependency issues.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/libLLVM/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/llvm/options.mk

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

Modified files:

Index: pkgsrc/lang/libLLVM/options.mk
diff -u pkgsrc/lang/libLLVM/options.mk:1.2 pkgsrc/lang/libLLVM/options.mk:1.3
--- pkgsrc/lang/libLLVM/options.mk:1.2  Mon Nov 14 20:15:33 2016
+++ pkgsrc/lang/libLLVM/options.mk      Tue May  9 12:23:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2016/11/14 20:15:33 ryoon Exp $
+# $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 Hex
 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.
@@ -36,4 +47,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;}"

Index: pkgsrc/lang/llvm/options.mk
diff -u pkgsrc/lang/llvm/options.mk:1.2 pkgsrc/lang/llvm/options.mk:1.3
--- pkgsrc/lang/llvm/options.mk:1.2     Mon Nov 14 20:15:32 2016
+++ pkgsrc/lang/llvm/options.mk Tue May  9 12:23:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2016/11/14 20:15:32 ryoon Exp $
+# $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 Hex
 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;}"