svn commit: r255454 - head/tools

Dag-Erling Smørgrav des at FreeBSD.org
Tue Sep 10 18:34:39 UTC 2013


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})


More information about the svn-src-all mailing list