From owner-svn-ports-all@freebsd.org Mon Jan 6 00:19:42 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 64A751EB6B6; Mon, 6 Jan 2020 00:19:42 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47rbjp25bKz3xXk; Mon, 6 Jan 2020 00:19:42 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 261755E27; Mon, 6 Jan 2020 00:19:42 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0060JfgI075784; Mon, 6 Jan 2020 00:19:41 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0060Jfw8075782; Mon, 6 Jan 2020 00:19:41 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <202001060019.0060Jfw8075782@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Mon, 6 Jan 2020 00:19:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r522175 - head/editors/vim X-SVN-Group: ports-head X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: head/editors/vim X-SVN-Commit-Revision: 522175 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jan 2020 00:19:42 -0000 Author: adamw Date: Mon Jan 6 00:19:41 2020 New Revision: 522175 URL: https://svnweb.freebsd.org/changeset/ports/522175 Log: vim: Add a MAKE_JOBS option for concurrent build, default off Most systems are able to build vim in parallel most of the time. The dependency chain in the Makefiles are a spaghetti mess and concurrency is broken with some frequency, so it just isn't feasible for it to be on by default. It does shave quite a bit of time off the build (and I have had .undef MAKE_JOBS_UNSAFE in Makefile.local for years), so now there's an option. It's off by default. PR: 243109 Reported by: glewis Modified: head/editors/vim/Makefile Modified: head/editors/vim/Makefile ============================================================================== --- head/editors/vim/Makefile Mon Jan 6 00:07:08 2020 (r522174) +++ head/editors/vim/Makefile Mon Jan 6 00:19:41 2020 (r522175) @@ -28,7 +28,6 @@ MAKE_ARGS= STRIP="${STRIP_CMD}" \ CPE_VERSION= ${PORTVERSION:R} GNU_CONFIGURE= yes -MAKE_JOBS_UNSAFE= yes PLIST_SUB= VIM_VER=${VIM_VER} PORTDATA?= ${VIM_VER} PORTSCOUT= ignore:1 @@ -39,7 +38,7 @@ VIM_VER= ${PORTNAME}${PORTVERSION:R:S|.||g} # OPTIONS # ### Make sure any new options are excluded below in CONSOLE/TINY OPTIONS_DEFAULT= CSCOPE DEFAULT_VIMRC CTAGS_EXUBERANT GTK3 PERL PYTHON3 RUBY -OPTIONS_DEFINE= CSCOPE DEFAULT_VIMRC NLS XTERM_SAVE +OPTIONS_DEFINE= CSCOPE DEFAULT_VIMRC MAKE_JOBS NLS XTERM_SAVE OPTIONS_SINGLE= CTAGS UI OPTIONS_SINGLE_CTAGS= CTAGS_BASE CTAGS_EXUBERANT CTAGS_UNIVERSAL OPTIONS_SINGLE_UI= ATHENA CONSOLE GNOME GTK2 GTK3 MOTIF X11 @@ -49,14 +48,15 @@ OPTIONS_SUB= yes .if defined(CONSOLE) || defined(TINY) OPTIONS_SLAVE= CONSOLE -# Exclude everything except the two options above -OPTIONS_EXCLUDE:= ${OPTIONS_DEFINE:NDEFAULT_VIMRC} \ +# Exclude everything except CONSOLE, DEFAULT_VIMRC, MAKE_JOBS +OPTIONS_EXCLUDE:= ${OPTIONS_DEFINE:NDEFAULT_VIMRC:NMAKE_JOBS} \ ${OPTIONS_SINGLE_UI:NCONSOLE} \ ${OPTIONS_GROUP_LANGBIND} \ ${OPTIONS_SINGLE_CTAGS} .endif DEFAULT_VIMRC_DESC= Install bundled vimrc as default setting +MAKE_JOBS_DESC= Enable parallel build XTERM_SAVE_DESC= Restore xterm screen after exit CTAGS_BASE_DESC= Use system ctags @@ -80,6 +80,8 @@ CSCOPE_RUN_DEPENDS= cscope:devel/cscope CTAGS_EXUBERANT_RUN_DEPENDS= exctags:devel/ctags CTAGS_UNIVERSAL_RUN_DEPENDS= uctags:devel/universal-ctags + +MAKE_JOBS_VARS_OFF= MAKE_JOBS_UNSAFE=yes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext