[pkgsrc/trunk]: pkgsrc/lang Add a terminfo option and enable by default (and ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b7b61c07d70
branches:  trunk
changeset: 362212:1b7b61c07d70
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue May 09 12:23:42 2017 +0000

description:
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.

diffstat:

 lang/libLLVM/options.mk |  19 ++++++++++++++++++-
 lang/llvm/options.mk    |  19 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diffs (76 lines):

diff -r a7231716e877 -r 1b7b61c07d70 lang/libLLVM/options.mk
--- a/lang/libLLVM/options.mk   Tue May 09 11:54:36 2017 +0000
+++ b/lang/libLLVM/options.mk   Tue May 09 12:23:42 2017 +0000
@@ -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 @@
 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 @@
 .  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;}"
diff -r a7231716e877 -r 1b7b61c07d70 lang/llvm/options.mk
--- a/lang/llvm/options.mk      Tue May 09 11:54:36 2017 +0000
+++ b/lang/llvm/options.mk      Tue May 09 12:23:42 2017 +0000
@@ -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 @@
 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 @@
 .  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;}"