From owner-svn-src-all@FreeBSD.ORG Wed Mar 7 21:05:34 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D316C1065674; Wed, 7 Mar 2012 21:05:34 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from adsum.doit.wisc.edu (adsum.doit.wisc.edu [144.92.197.210]) by mx1.freebsd.org (Postfix) with ESMTP id A2E258FC16; Wed, 7 Mar 2012 21:05:34 +0000 (UTC) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; CHARSET=US-ASCII; format=flowed Received: from avs-daemon.smtpauth1.wiscmail.wisc.edu by smtpauth1.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7u2-7.05 32bit (built Jul 30 2009)) id <0M0J0040M99AXL00@smtpauth1.wiscmail.wisc.edu>; Wed, 07 Mar 2012 15:05:34 -0600 (CST) Received: from anacreon.physics.wisc.edu (anacreon.physics.wisc.edu [128.104.160.176]) by smtpauth1.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7u2-7.05 32bit (built Jul 30 2009)) with ESMTPSA id <0M0J0046X998JY00@smtpauth1.wiscmail.wisc.edu>; Wed, 07 Mar 2012 15:05:32 -0600 (CST) Date: Wed, 07 Mar 2012 15:05:31 -0600 From: Nathan Whitehorn In-reply-to: To: Sergey Kandaurov Message-id: <4F57CD9B.5010600@freebsd.org> X-Spam-Report: AuthenticatedSender=yes, SenderIP=128.104.160.176 X-Spam-PmxInfo: Server=avs-15, Version=5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.3.7.205414, SenderIP=128.104.160.176 References: <201203072046.q27KkxFr009846@svn.freebsd.org> <4F57C9C8.80907@freebsd.org> User-Agent: Mozilla/5.0 (X11; U; FreeBSD powerpc; en-US; rv:1.9.2.25) Gecko/20120130 Thunderbird/3.1.17 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r232671 - head X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Mar 2012 21:05:34 -0000 On 03/07/12 14:53, Sergey Kandaurov wrote: > On 8 March 2012 00:49, Nathan Whitehorn wrote: >> On 03/07/12 14:46, Sergey Kandaurov wrote: >>> Author: pluknet >>> Date: Wed Mar 7 20:46:59 2012 >>> New Revision: 232671 >>> URL: http://svn.freebsd.org/changeset/base/232671 >>> >>> Log: >>> Add lib32 part for libutil after its version bump to 9. >>> >>> PR: misc/165523 >>> Submitted by: Andrey Zonov >>> MFC after: 1 week >>> >>> Modified: >>> head/ObsoleteFiles.inc >>> >>> Modified: head/ObsoleteFiles.inc >>> >>> ============================================================================== >>> --- head/ObsoleteFiles.inc Wed Mar 7 18:57:09 2012 (r232670) >>> +++ head/ObsoleteFiles.inc Wed Mar 7 20:46:59 2012 (r232671) >>> @@ -417,6 +417,9 @@ OLD_FILES+=usr/share/man/man5/lastlog.5. >>> OLD_FILES+=usr/share/man/man5/utmp.5.gz >>> OLD_FILES+=usr/share/man/man5/wtmp.5.gz >>> OLD_LIBS+=lib/libutil.so.8 >>> +.if ${TARGET_ARCH} == "amd64" >>> +OLB_LIBS+=usr/lib32/libutil.so.8 >>> +.endif >>> # 20100105: new userland semaphore implementation >>> OLD_FILES+=usr/include/sys/semaphore.h >>> # 20100103: ntptrace(8) removed >> >> This should also check for powerpc64. Or, better, do it unconditionally, >> since it will only remove files that actually exist and there's no harm >> trying to remove /usr/lib32/blah on 32-bit systems. >> -Nathan > Ok. so there are two way to go. > - add .if for powerpc64 (btw, does this arch exist in RELENG_8?) powerpc64 is new in RELENG_9. > - remove all lib32 related conditions throughout the file. > > The latter looks easier to maintain. I think that's a better way to go, especially with the addition of COMPAT_FREEBSD32 on mips. -Nathan