From owner-svn-src-head@freebsd.org  Wed Oct  5 20:12:02 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 09EE9AF786A;
 Wed,  5 Oct 2016 20:12:02 +0000 (UTC)
 (envelope-from emaste@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 mx1.freebsd.org (Postfix) with ESMTPS id CC78A224;
 Wed,  5 Oct 2016 20:12:01 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u95KC1n5093046;
 Wed, 5 Oct 2016 20:12:01 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u95KC1mg093045;
 Wed, 5 Oct 2016 20:12:01 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201610052012.u95KC1mg093045@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 5 Oct 2016 20:12:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r306729 - head/tools/build/options
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Oct 2016 20:12:02 -0000

Author: emaste
Date: Wed Oct  5 20:12:00 2016
New Revision: 306729
URL: https://svnweb.freebsd.org/changeset/base/306729

Log:
  makeman: avoid bogus output with duplicated options
  
  On some targets 'make showconfig' currently reports both 'no' and 'yes'
  for some options. For example:
  
  % make TARGET=mips showconfig | grep SSP
  MK_SSP           = no
  MK_SSP           = yes
  
  Emit a warning on encountering a duplicated variable, and skip the
  second entry.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/tools/build/options/makeman

Modified: head/tools/build/options/makeman
==============================================================================
--- head/tools/build/options/makeman	Wed Oct  5 20:08:07 2016	(r306728)
+++ head/tools/build/options/makeman	Wed Oct  5 20:12:00 2016	(r306729)
@@ -33,12 +33,18 @@ show_options()
 	ALL_TARGETS=$(echo $(${make} targets | tail -n +2))
 	rm -f $t/settings
 	for target in ${ALL_TARGETS} ; do
+		prev_opt=
 		env -i ${make} showconfig \
 		    SRC_ENV_CONF=/dev/null SRCCONF=/dev/null \
 		    __MAKE_CONF=/dev/null \
 		    TARGET_ARCH=${target#*/} TARGET=${target%/*} |
 		while read var _ val ; do
 			opt=${var#MK_}
+			if [ $opt = "$prev_opt" ]; then
+				echo "$target: ignoring duplicate option $opt" >&2
+				continue
+			fi
+			prev_opt=$opt
 			case ${val} in
 			yes)
 				echo ${opt} ${target}