From owner-svn-src-head@FreeBSD.ORG Wed Mar 7 21:34:50 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 CC9241065675; Wed, 7 Mar 2012 21:34:50 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-lpp01m010-f54.google.com (mail-lpp01m010-f54.google.com [209.85.215.54]) by mx1.freebsd.org (Postfix) with ESMTP id B1E128FC14; Wed, 7 Mar 2012 21:34:49 +0000 (UTC) Received: by lagv3 with SMTP id v3so10968529lag.13 for ; Wed, 07 Mar 2012 13:34:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=RVbF9X7AH9nWuXKichmT2HsJtoFCovi7AyoQmuB+16w=; b=izsAzU+h7X02JSD1myt+tl0LVNE/fhYCmzfGYd7yFZccP7v62m8+Wf1YGxaBC08g1s Re8nLIu4/o5Wcdv4XQoSvi5P3uo1M5Qqkn+ubBp4eGtnk8/axdDXn0t4XKASKGE2ss23 lLvaBhaFT7TS54oiXLE82o3DVjhcOhv3/ixkJacUKpbt1y09Ou6ze3hgVdzGsCArxvVP DGTBkym++q+Z0B0i8kaowmilim5M5MBI1VqSz6eD2eW8PdQ30s8UfulH1HeeI8QFsL0x aaKL/ckimg9dBcA3raB7yePgK82jCEN5+P5KKIDs63uY8hzmbp4YmoDLW2W7v4UvAX0r Ud3g== MIME-Version: 1.0 Received: by 10.152.145.135 with SMTP id su7mr2632552lab.5.1331156088371; Wed, 07 Mar 2012 13:34:48 -0800 (PST) Sender: pluknet@gmail.com Received: by 10.152.21.73 with HTTP; Wed, 7 Mar 2012 13:34:48 -0800 (PST) In-Reply-To: <4F57D2D3.60409@freebsd.org> References: <201203072046.q27KkxFr009846@svn.freebsd.org> <4F57C9C8.80907@freebsd.org> <4F57CD9B.5010600@freebsd.org> <4F57D2D3.60409@freebsd.org> Date: Thu, 8 Mar 2012 00:34:48 +0300 X-Google-Sender-Auth: pikcR8bHfdRPETEwdZ0GpsI0NOI Message-ID: From: Sergey Kandaurov To: Nathan Whitehorn Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable 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:34:50 -0000 On 8 March 2012 01:27, Nathan Whitehorn wrote: > On 03/07/12 15:18, Sergey Kandaurov wrote: >> >> On 8 March 2012 01:05, Nathan Whitehorn =A0wrote= : >>> >>> On 03/07/12 14:53, Sergey Kandaurov wrote: >>>> >>>> On 8 March 2012 00:49, Nathan Whitehorn >>>> =A0wrote: >>>>> >>>>> On 03/07/12 14:46, Sergey Kandaurov wrote: >>>>>> >>>>>> Author: pluknet >>>>>> Date: Wed Mar =A07 20:46:59 2012 >>>>>> New Revision: 232671 >>>>>> URL: http://svn.freebsd.org/changeset/base/232671 >>>>>> >>>>>> Log: >>>>>> =A0 Add lib32 part for libutil after its version bump to 9. >>>>>> >>>>>> =A0 PR: =A0 =A0 =A0 =A0 =A0misc/165523 >>>>>> =A0 Submitted by: =A0 =A0 =A0 =A0Andrey Zonov >>>>>> =A0 MFC after: =A0 1 week >>>>>> >>>>>> Modified: >>>>>> =A0 head/ObsoleteFiles.inc >>>>>> >>>>>> Modified: head/ObsoleteFiles.inc >>>>>> >>>>>> >>>>>> >>>>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D >>>>>> --- head/ObsoleteFiles.inc =A0 =A0 =A0Wed Mar =A07 18:57:09 2012 >>>>>> =A0(r232670) >>>>>> +++ head/ObsoleteFiles.inc =A0 =A0 =A0Wed Mar =A07 20:46:59 2012 >>>>>> =A0(r232671) >>>>>> @@ -417,6 +417,9 @@ OLD_FILES+=3Dusr/share/man/man5/lastlog.5. >>>>>> =A0OLD_FILES+=3Dusr/share/man/man5/utmp.5.gz >>>>>> =A0OLD_FILES+=3Dusr/share/man/man5/wtmp.5.gz >>>>>> =A0OLD_LIBS+=3Dlib/libutil.so.8 >>>>>> +.if ${TARGET_ARCH} =3D=3D "amd64" >>>>>> +OLB_LIBS+=3Dusr/lib32/libutil.so.8 >>>>>> +.endif >>>>>> =A0# 20100105: new userland semaphore implementation >>>>>> =A0OLD_FILES+=3Dusr/include/sys/semaphore.h >>>>>> =A0# 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 ha= rm >>>>> 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 >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> --- ObsoleteFiles.inc =A0 (revision 232672) >> +++ ObsoleteFiles.inc =A0 (working copy) >> @@ -56,9 +56,7 @@ >> =A0 =A0 =A0 =A0 usr/share/man/man3/archive_write_set_compression_none.3.= gz \ >> =A0 =A0 =A0 =A0 usr/share/man/man3/archive_write_set_compression_program= .3.gz >> =A0OLD_LIBS+=3Dusr/lib/libarchive.so.5 >> -.if ${TARGET_ARCH} =3D=3D "amd64" || ${TARGET_ARCH} =3D=3D "powerpc64" >> =A0OLD_LIBS+=3Dusr/lib32/libarchive.so.5 >> -.endif > > > I like it. > -Nathan I will commit the patch tomorrow then if no one else will object against it= . Thanks for review. --=20 wbr, pluknet