From owner-svn-src-head@FreeBSD.ORG Wed Mar 7 20:53:52 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 B652110656D9; Wed, 7 Mar 2012 20:53:52 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-bk0-f54.google.com (mail-bk0-f54.google.com [209.85.214.54]) by mx1.freebsd.org (Postfix) with ESMTP id A360C8FC18; Wed, 7 Mar 2012 20:53:51 +0000 (UTC) Received: by bkcjc3 with SMTP id jc3so7569264bkc.13 for ; Wed, 07 Mar 2012 12:53:50 -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=VA7jemCzHs9xThm/GsX31HiHPzaVlCXYkhKvOxvEoLE=; b=w3w69Htlbe8lJfVbqZydYW6qJ9YlPMWZkbnW7lYVMmXxwXn8ItoLgulYLXIHvCCEM1 AZuCMKxeYf/xVqb0/2kCd3YtsKQKC2UVeru2E+YKLZJz0jqyrsXSYsm4H4lEw/9666BH Ge1Y1eGB76pDa5XECDrmGrGWcSj5swZ8W7KH0y9PorbfCtGcdyMWGFDu1g7kADWTd0R0 P7erWAz+TZtBdhzFlM2eMn706+MEEkI8H1O0Vbms5Krl7FwO94/zNxqMLCwp/n8jqeue DxxM6ebonrSwqrSd/tDhOEtd/8jV618YdMMXVcj2XJic8T5uDPYh0gbTb0yXceoU5B5K F7+w== MIME-Version: 1.0 Received: by 10.112.44.232 with SMTP id h8mr1238070lbm.85.1331153630423; Wed, 07 Mar 2012 12:53:50 -0800 (PST) Sender: pluknet@gmail.com Received: by 10.152.21.73 with HTTP; Wed, 7 Mar 2012 12:53:50 -0800 (PST) In-Reply-To: <4F57C9C8.80907@freebsd.org> References: <201203072046.q27KkxFr009846@svn.freebsd.org> <4F57C9C8.80907@freebsd.org> Date: Wed, 7 Mar 2012 23:53:50 +0300 X-Google-Sender-Auth: lZzHKCPHM4_B8E-FO445LQy9sGE 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 20:53:52 -0000 On 8 March 2012 00:49, Nathan Whitehorn wrote: > 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 =A0= =A0 =A0(r232670) >> +++ head/ObsoleteFiles.inc =A0 =A0 =A0Wed Mar =A07 20:46:59 2012 =A0 =A0= =A0 =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 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?) - remove all lib32 related conditions throughout the file. The latter looks easier to maintain. --=20 wbr, pluknet