Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 1E91F7A200 for ; Tue, 9 May 2017 12:23:44 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id BA51084DC0; Tue, 9 May 2017 12:23:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 49A6484D75 for ; Tue, 9 May 2017 12:23:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id vIZaM1v3qoYK for ; Tue, 9 May 2017 12:23:42 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id BD7C484CDD for ; Tue, 9 May 2017 12:23:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B0A01FBE4; Tue, 9 May 2017 12:23:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_149433262277870" MIME-Version: 1.0 Date: Tue, 9 May 2017 12:23:42 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/lang To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20170509122342.B0A01FBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_149433262277870 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_149433262277870 Content-Disposition: inline Content-Length: 2743 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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;}" --_----------=_149433262277870--