Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Sep 2013 18:34:38 +0000 (UTC)
From:      Dag-Erling Smørgrav <des@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r255454 - head/tools
Message-ID:  <201309101834.r8AIYcl6014109@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: des
Date: Tue Sep 10 18:34:38 2013
New Revision: 255454
URL: http://svnweb.freebsd.org/changeset/base/255454

Log:
  Make this more deterministic by sorting the libraries before processing
  them and ensuring that we always use the samme collation rules.
  
  Approved by:	re (gjb)

Modified:
  head/tools/make_libdeps.sh

Modified: head/tools/make_libdeps.sh
==============================================================================
--- head/tools/make_libdeps.sh	Tue Sep 10 17:26:09 2013	(r255453)
+++ head/tools/make_libdeps.sh	Tue Sep 10 18:34:38 2013	(r255454)
@@ -28,6 +28,7 @@
 
 export PATH=/bin:/usr/bin
 
+LC_ALL=C			# make sort deterministic
 FS=': '				# internal field separator
 LIBDEPENDS=./_libdeps		# intermediate output file
 USRSRC=${1:-/usr/src}		# source root
@@ -64,7 +65,7 @@ genlibdepends()
 {
 	(
 		cd ${USRSRC}
-		find ${LIBS} -mindepth 1 -name Makefile |
+		find -s ${LIBS} -mindepth 1 -name Makefile |
 		xargs grep -l 'bsd\.lib\.mk' |
 		while read makefile; do
 			libdir=$(dirname ${makefile})



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