Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 Jun 2017 00:41:25 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r319669 - head
Message-ID:  <201706080041.v580fPAr082820@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Thu Jun  8 00:41:25 2017
New Revision: 319669
URL: https://svnweb.freebsd.org/changeset/base/319669

Log:
  Fix src.conf.5 generation
  
  When makeman is generating src.conf(5) it tries to test all variation of options
  including WITH_DIRDEPS_BUILD. it results in an error when filemon(4) is not
  loaded.
  
  Export variables that are needed to prevent this behaviour.
  
  Helped by:	sjg

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Jun  8 00:36:58 2017	(r319668)
+++ head/Makefile.inc1	Thu Jun  8 00:41:25 2017	(r319669)
@@ -2576,8 +2576,8 @@ check-old: check-old-files check-old-libs check-old-di
 # showconfig - show build configuration.
 #
 showconfig: .PHONY
-	@(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1; \
-	  ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1) 2>&1 | grep ^MK_ | sort -u
+	@(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1 UPDATE_DEPENDFILE=no NO_OBJ=yes; \
+	  ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1 UPDATE_DEPENDFILE=no NO_OBJ=yes) 2>&1 | grep ^MK_ | sort -u
 
 .if !empty(KRNLOBJDIR) && !empty(KERNCONF)
 DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706080041.v580fPAr082820>