From owner-svn-src-head@FreeBSD.ORG  Fri Aug  1 19:32:20 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 95ED5F07;
 Fri,  1 Aug 2014 19:32:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 8303F2B8F;
 Fri,  1 Aug 2014 19:32:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s71JWKqN067675;
 Fri, 1 Aug 2014 19:32:20 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s71JWK4O067674;
 Fri, 1 Aug 2014 19:32:20 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201408011932.s71JWK4O067674@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Fri, 1 Aug 2014 19:32:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269392 - head/etc/defaults
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.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Aug 2014 19:32:20 -0000

Author: peter
Date: Fri Aug  1 19:32:20 2014
New Revision: 269392
URL: http://svnweb.freebsd.org/changeset/base/269392

Log:
  Like with /usr/lib + /usr/lib/compat, add the optional /usr/lib32/compat
  to the ldconfig32 default path.  /usr/lib32 is the 32 bit versions of
  *current* libraries, while old versions should be able to be in
  /usr/lib32/compat, like with /usr/lib/compat.  The separation is meant to
  keep the compile time default search paths cleaner.

Modified:
  head/etc/defaults/rc.conf

Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf	Fri Aug  1 18:36:40 2014	(r269391)
+++ head/etc/defaults/rc.conf	Fri Aug  1 19:32:20 2014	(r269392)
@@ -610,7 +610,8 @@ clear_tmp_X="YES" 	# Clear and recreate 
 ldconfig_insecure="NO"	# Set to YES to disable ldconfig security checks
 ldconfig_paths="/usr/lib/compat /usr/local/lib /usr/local/lib/compat/pkg"
 			# shared library search paths
-ldconfig32_paths="/usr/lib32" # 32-bit compatibility shared library search paths
+ldconfig32_paths="/usr/lib32 /usr/lib32/compat"
+			# 32-bit compatibility shared library search paths
 ldconfig_paths_aout="/usr/lib/compat/aout /usr/local/lib/aout"
 			# a.out shared library search paths
 ldconfig_local_dirs="/usr/local/libdata/ldconfig"