svn commit: r232671 - head

[Nathan Whitehorn]

On 03/07/12 14:53, Sergey Kandaurov wrote:
> On 8 March 2012 00:49, Nathan Whitehorn<nwhitehorn at 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