Date: Thu, 8 Mar 2012 00:34:48 +0300 From: Sergey Kandaurov <pluknet@freebsd.org> To: Nathan Whitehorn <nwhitehorn@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r232671 - head Message-ID: <CAE-mSO%2BwqoHB6%2BWtSp1Ce2QBmM=wtcoRjQ5ok0oWnQi9n3o35w@mail.gmail.com> In-Reply-To: <4F57D2D3.60409@freebsd.org> References: <201203072046.q27KkxFr009846@svn.freebsd.org> <4F57C9C8.80907@freebsd.org> <CAE-mSOJWcZ%2BXmPBmwh8Oq2YJ=sTTxmhfDEaLf8Po55AYqc11UQ@mail.gmail.com> <4F57CD9B.5010600@freebsd.org> <CAE-mSOK2gdiurZuw61K1_iyt8g65NPWp%2BtbpgkU-Xru_T%2BQEBg@mail.gmail.com> <4F57D2D3.60409@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 8 March 2012 01:27, Nathan Whitehorn <nwhitehorn@freebsd.org> wrote: > On 03/07/12 15:18, Sergey Kandaurov wrote: >> >> On 8 March 2012 01:05, Nathan Whitehorn<nwhitehorn@freebsd.org> wrote: >>> >>> On 03/07/12 14:53, Sergey Kandaurov wrote: >>>> >>>> On 8 March 2012 00:49, Nathan Whitehorn<nwhitehorn@freebsd.org> >>>> 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<andrey zonov org> >>>>>> 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 I will commit the patch tomorrow then if no one else will object against it. Thanks for review. -- wbr, pluknet
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAE-mSO%2BwqoHB6%2BWtSp1Ce2QBmM=wtcoRjQ5ok0oWnQi9n3o35w>