Date: Wed, 7 Mar 2012 23:53:50 +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-mSOJWcZ%2BXmPBmwh8Oq2YJ=sTTxmhfDEaLf8Po55AYqc11UQ@mail.gmail.com> In-Reply-To: <4F57C9C8.80907@freebsd.org> References: <201203072046.q27KkxFr009846@svn.freebsd.org> <4F57C9C8.80907@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 =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<andrey zonov org> >> =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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAE-mSOJWcZ%2BXmPBmwh8Oq2YJ=sTTxmhfDEaLf8Po55AYqc11UQ>