From owner-svn-src-head@FreeBSD.ORG Fri Oct 7 21:59:47 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB9171065672; Fri, 7 Oct 2011 21:59:47 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a01:4f8:131:23c2::1]) by mx1.freebsd.org (Postfix) with ESMTP id 752778FC17; Fri, 7 Oct 2011 21:59:47 +0000 (UTC) Received: from localhost (acme.spoerlein.net [IPv6:2a01:4f8:131:23c2::1]) by acme.spoerlein.net (8.14.4/8.14.4) with ESMTP id p97Lxjt5093231 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Fri, 7 Oct 2011 23:59:46 +0200 (CEST) (envelope-from uqs@FreeBSD.org) Date: Fri, 7 Oct 2011 23:59:45 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Nathan Whitehorn Message-ID: <20111007215945.GP26743@acme.spoerlein.net> Mail-Followup-To: Ulrich =?utf-8?B?U3DDtnJsZWlu?= , Nathan Whitehorn , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org References: <201110032046.p93Kkah0027160@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201110032046.p93Kkah0027160@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r225951 - head X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 21:59:48 -0000 On Mon, 2011-10-03 at 20:46:36 +0000, Nathan Whitehorn wrote: > Author: nwhitehorn > Date: Mon Oct 3 20:46:36 2011 > New Revision: 225951 > URL: http://svn.freebsd.org/changeset/base/225951 > > Log: > Fix a number of platform problems in this file (mostly assuming that only > amd64 has lib32). > > Modified: > head/ObsoleteFiles.inc > > Modified: head/ObsoleteFiles.inc > ============================================================================== > --- head/ObsoleteFiles.inc Mon Oct 3 20:32:55 2011 (r225950) > +++ head/ObsoleteFiles.inc Mon Oct 3 20:46:36 2011 (r225951) > @@ -56,7 +56,7 @@ OLD_LIBS+=usr/lib/libdwarf.so.2 > OLD_LIBS+=usr/lib/libopie.so.6 > OLD_LIBS+=usr/lib/librtld_db.so.1 > OLD_LIBS+=usr/lib/libtacplus.so.4 > -.if ${TARGET_ARCH} == "amd64" > +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" > OLD_LIBS+=usr/lib32/libcam.so.5 > OLD_LIBS+=usr/lib32/libpcap.so.7 > OLD_LIBS+=usr/lib32/libufs.so.5 These conditionals should all be removed. 99% of them are not needed. The rm(1) should only be conditional on TARGET != arch1 iff arch1 is still using the file in question. It doesn't matter that arch2 never ever had that file. It's just one more rm(1) to a non-existing file. Uli