From owner-svn-src-head@FreeBSD.ORG Wed Mar 7 21:27:54 2012 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 21FCC10656DB; Wed, 7 Mar 2012 21:27:54 +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 E40B58FC13; Wed, 7 Mar 2012 21:27:53 +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 <0M0J0080EAAH3V00@smtpauth1.wiscmail.wisc.edu>; Wed, 07 Mar 2012 15:27:53 -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 <0M0J0035BAAB4E10@smtpauth1.wiscmail.wisc.edu>; Wed, 07 Mar 2012 15:27:47 -0600 (CST) Date: Wed, 07 Mar 2012 15:27:47 -0600 From: Nathan Whitehorn In-reply-to: To: Sergey Kandaurov Message-id: <4F57D2D3.60409@freebsd.org> X-Spam-Report: AuthenticatedSender=yes, SenderIP=128.104.160.176 X-Spam-PmxInfo: Server=avs-14, Version=5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.3.7.211521, SenderIP=128.104.160.176 References: <201203072046.q27KkxFr009846@svn.freebsd.org> <4F57C9C8.80907@freebsd.org> <4F57CD9B.5010600@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-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: Wed, 07 Mar 2012 21:27:54 -0000 On 03/07/12 15:18, Sergey Kandaurov wrote: > On 8 March 2012 01:05, Nathan Whitehorn wrote: >> 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 > Does this patch look good for you? > > Index: ObsoleteFiles.inc > =================================================================== > --- ObsoleteFiles.inc (revision 232672) > +++ ObsoleteFiles.inc (working copy) > @@ -56,9 +56,7 @@ > usr/share/man/man3/archive_write_set_compression_none.3.gz \ > usr/share/man/man3/archive_write_set_compression_program.3.gz > OLD_LIBS+=usr/lib/libarchive.so.5 > -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" > OLD_LIBS+=usr/lib32/libarchive.so.5 > -.endif I like it. -Nathan