Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Oct 2011 07:49:47 +0000 (UTC)
From:      Ed Schouten <ed@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r226785 - head
Message-ID:  <201110260749.p9Q7nlj3038764@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ed
Date: Wed Oct 26 07:49:47 2011
New Revision: 226785
URL: http://svn.freebsd.org/changeset/base/226785

Log:
  Attempt to fix build logic for gensnmptree.
  
  There are two problems with the existing logic. It builds gensnmptree
  on <700018, even if WITHOUT_BSNMP is set, but more importantly, we must
  not forget to build gensnmptree on systems that have originally been
  built without. This causes a buildworld on those systems to fail.
  
  MFC after:	1 week

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Oct 26 06:50:40 2011	(r226784)
+++ head/Makefile.inc1	Wed Oct 26 07:49:47 2011	(r226785)
@@ -1018,7 +1018,8 @@ _yacc=		usr.bin/yacc
 _awk=		usr.bin/awk
 .endif
 
-.if ${BOOTSTRAPPING} < 700018
+.if ${MK_BSNMP} != "no" && \
+    (${BOOTSTRAPPING} < 700018 || !exists(/usr/sbin/gensnmptree))
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
 



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