summaryrefslogtreecommitdiff
path: root/editors/vim
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2010-09-17 00:46:45 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2010-09-17 00:46:45 +0000
commit45a32494a21ffa04d305a13fe9a4376cda71caae (patch)
treec520c2ea280d1fee64f484f114e13b67f67b849b /editors/vim
parent- Update to 1.15.5 (diff)
Enable MAKE_JOBS_SAFE for Vim build so it will build in parallel.
This deals with the misspelling of "./auto/osdef.h" in some of the .o dependencies - which is what caused the race condition needing MAKE_JOBS_UNSAFE=yes.
Notes
Notes: svn path=/head/; revision=261308
Diffstat (limited to 'editors/vim')
-rw-r--r--editors/vim/Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 9382d1051958..94a35dd1fbdd 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -39,7 +39,7 @@ SLAVEDIRS= editors/vim-lite
.endif
CONFLICTS= vim6* vim*-lite
-MAKE_JOBS_UNSAFE= yes
+MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
DIST_SUBDIR= vim
WRKSRC= ${WRKDIR}/vim${PORTVERSION:C/\.[0-9]*$//:S/.//g}/src
@@ -195,6 +195,9 @@ post-patch:
${REINPLACE_CMD} -e 's,ctags -R \.,${CTAGS_CMD},g')
pre-configure:
+ # Fix dependency misspelling so that 'make -j#' will work.
+ @${REINPLACE_CMD} -e 's|\./auto/osdef\.h|auto/osdef.h|g' \
+ ${WRKSRC}/Makefile
@(cd ${WRKSRC} ; ${MAKE} distclean)
@${REINPLACE_CMD} -e ' \
s|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \
@@ -207,6 +210,9 @@ pre-configure:
${WRKSRC}/feature.h
.endif
+post-configure:
+ @(cd ${WRKSRC} ; ${MAKE} scratch config)
+
# Clean up junk files to keep them from being installed.
pre-install:
@${FIND} ${WRKSRC:H} -type f -name '*.orig' -delete