Date: Thu, 8 Mar 2012 00:18:04 +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-mSOK2gdiurZuw61K1_iyt8g65NPWp%2BtbpgkU-Xru_T%2BQEBg@mail.gmail.com> In-Reply-To: <4F57CD9B.5010600@freebsd.org> References: <201203072046.q27KkxFr009846@svn.freebsd.org> <4F57C9C8.80907@freebsd.org> <CAE-mSOJWcZ%2BXmPBmwh8Oq2YJ=sTTxmhfDEaLf8Po55AYqc11UQ@mail.gmail.com> <4F57CD9B.5010600@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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> =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<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(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 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 =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 (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+=3Dusr/lib/libarchive.so.5 -.if ${TARGET_ARCH} =3D=3D "amd64" || ${TARGET_ARCH} =3D=3D "powerpc64" OLD_LIBS+=3Dusr/lib32/libarchive.so.5 -.endif # 20120113: removal of wtmpcvt(1) OLD_FILES+=3Dusr/bin/wtmpcvt OLD_FILES+=3Dusr/share/man/man1/wtmpcvt.1.gz @@ -71,12 +69,10 @@ OLD_FILES+=3Dusr/lib/libodialog.so OLD_LIBS+=3Dusr/lib/libodialog.so.7 OLD_FILES+=3Dusr/lib/libodialog_p.a -.if ${TARGET_ARCH} =3D=3D "amd64" || ${TARGET_ARCH} =3D=3D "powerpc64" OLD_FILES+=3Dusr/lib32/libodialog.a OLD_FILES+=3Dusr/lib32/libodialog.so OLD_LIBS+=3Dusr/lib32/libodialog.so.7 OLD_FILES+=3Dusr/lib32/libodialog_p.a -.endif # 20110930: sysinstall removed OLD_FILES+=3Dusr/sbin/sysinstall OLD_FILES+=3Dusr/share/man/man8/sysinstall.8.gz @@ -84,12 +80,10 @@ OLD_FILES+=3Dusr/lib/libftpio.so OLD_LIBS+=3Dusr/lib/libftpio.so.8 OLD_FILES+=3Dusr/lib/libftpio_p.a -.if ${TARGET_ARCH} =3D=3D "amd64" || ${TARGET_ARCH} =3D=3D "powerpc64" OLD_FILES+=3Dusr/lib32/libftpio.a OLD_FILES+=3Dusr/lib32/libftpio.so OLD_LIBS+=3Dusr/lib32/libftpio.so.8 OLD_FILES+=3Dusr/lib32/libftpio_p.a -.endif OLD_FILES+=3Dusr/include/ftpio.h OLD_FILES+=3Dusr/share/man/man3/ftpio.3.gz # 20110915: rename congestion control manpages @@ -108,7 +102,6 @@ OLD_LIBS+=3Dusr/lib/libopie.so.6 OLD_LIBS+=3Dusr/lib/librtld_db.so.1 OLD_LIBS+=3Dusr/lib/libtacplus.so.4 -.if ${TARGET_ARCH} =3D=3D "amd64" || ${TARGET_ARCH} =3D=3D "powerpc64" OLD_LIBS+=3Dusr/lib32/libcam.so.5 OLD_LIBS+=3Dusr/lib32/libpcap.so.7 OLD_LIBS+=3Dusr/lib32/libufs.so.5 @@ -117,7 +110,6 @@ OLD_LIBS+=3Dusr/lib32/libopie.so.6 OLD_LIBS+=3Dusr/lib32/librtld_db.so.1 OLD_LIBS+=3Dusr/lib32/libtacplus.so.4 -.endif # 20110817: no more acd.4, ad.4, afd.4 and ast.4 OLD_FILES+=3Dusr/share/man/man4/acd.4.gz OLD_FILES+=3Dusr/share/man/man4/ad.4.gz @@ -157,17 +149,13 @@ OLD_FILES+=3Dusr/lib/libpkg.so OLD_LIBS+=3Dusr/lib/libpkg.so.0 OLD_FILES+=3Dusr/lib/libpkg_p.a -.if ${TARGET_ARCH} =3D=3D "amd64" || ${TARGET_ARCH} =3D=3D "powerpc64" OLD_FILES+=3Dusr/lib32/libpkg.a OLD_FILES+=3Dusr/lib32/libpkg.so OLD_LIBS+=3Dusr/lib32/libpkg.so.0 OLD_FILES+=3Dusr/lib32/libpkg_p.a -.endif # 20110517: libsbuf version bump OLD_LIBS+=3Dlib/libsbuf.so.5 -.if ${TARGET_ARCH} =3D=3D "amd64" || ${TARGET_ARCH} =3D=3D "powerpc64" OLD_LIBS+=3Dusr/lib32/libsbuf.so.5 -.endif # 20110502: new clang import which bumps version from 2.9 to 3.0 OLD_FILES+=3Dusr/include/clang/2.9/emmintrin.h OLD_FILES+=3Dusr/include/clang/2.9/mm_malloc.h @@ -196,12 +184,10 @@ OLD_FILES+=3Dusr/libexec/cc1obj OLD_LIBS+=3Dusr/lib/libobjc.so.4 OLD_DIRS+=3Dusr/include/objc -.if ${TARGET_ARCH} =3D=3D "amd64" || ${TARGET_ARCH} =3D=3D "powerpc64" OLD_FILES+=3Dusr/lib32/libobjc.a OLD_FILES+=3Dusr/lib32/libobjc.so OLD_FILES+=3Dusr/lib32/libobjc_p.a OLD_LIBS+=3Dusr/lib32/libobjc.so.4 -.endif # 20110331: firmware.img created at build time OLD_FILES+=3Dusr/share/examples/kld/firmware/fwimage/firmware.img # 20110224: sticky.8 -> sticky.7 @@ -323,9 +309,7 @@ .endif # 20100514: library version bump for versioned symbols for liblzma OLD_LIBS+=3Dusr/lib/liblzma.so.0 -.if ${TARGET_ARCH} =3D=3D "amd64" || ${TARGET_ARCH} =3D=3D "powerpc64" OLD_LIBS+=3Dusr/lib32/liblzma.so.0 -.endif # 20100511: move GCC-specific headers to /usr/include/gcc .if ${TARGET_ARCH} =3D=3D "amd64" || ${TARGET_ARCH} =3D=3D "i386" OLD_FILES+=3Dusr/include/emmintrin.h @@ -366,9 +350,7 @@ OLD_FILES+=3Dusr/share/man/man1/gcpio.1.gz # 20100322: libz update OLD_LIBS+=3Dlib/libz.so.5 -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_LIBS+=3Dusr/lib32/libz.so.5 -.endif # 20100314: removal of regexp.h OLD_FILES+=3Dusr/include/regexp.h OLD_FILES+=3Dusr/share/man/man3/regexp.3.gz @@ -417,9 +399,7 @@ OLD_FILES+=3Dusr/share/man/man5/utmp.5.gz OLD_FILES+=3Dusr/share/man/man5/wtmp.5.gz OLD_LIBS+=3Dlib/libutil.so.8 -.if ${TARGET_ARCH} =3D=3D "amd64" OLB_LIBS+=3Dusr/lib32/libutil.so.8 -.endif # 20100105: new userland semaphore implementation OLD_FILES+=3Dusr/include/sys/semaphore.h # 20100103: ntptrace(8) removed @@ -627,7 +607,6 @@ OLD_LIBS+=3Dusr/lib/snmp_mibII.so.5 OLD_LIBS+=3Dusr/lib/snmp_netgraph.so.5 OLD_LIBS+=3Dusr/lib/snmp_pf.so.5 -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_LIBS+=3Dusr/lib32/libalias.so.6 OLD_LIBS+=3Dusr/lib32/libarchive.so.4 OLD_LIBS+=3Dusr/lib32/libauditd.so.4 @@ -728,7 +707,6 @@ OLD_LIBS+=3Dusr/lib32/pam_ssh.so.4 OLD_LIBS+=3Dusr/lib32/pam_tacplus.so.4 OLD_LIBS+=3Dusr/lib32/pam_unix.so.4 -.endif # 20090718: the gdm pam.d file is no longer required. OLD_FILES+=3Detc/pam.d/gdm # 20090714: net_add_domain(9) renamed to domain_add(9) @@ -915,9 +893,7 @@ OLD_FILES+=3Dusr/share/man/man8/slstat.8.gz # 20090321: libpcap upgraded to 1.0.0 OLD_LIBS+=3Dlib/libpcap.so.5 -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_LIBS+=3Dusr/lib32/libpcap.so.5 -.endif # 20090319: uscanner(4) has been removed OLD_FILES+=3Dusr/share/man/man4/uscanner.4.gz # 20090313: k8temp(4) renamed to amdtemp(4) @@ -929,17 +905,13 @@ OLD_FILES+=3Dusr/lib/libusb20_p.a OLD_FILES+=3Dusr/include/libusb20_compat01.h OLD_FILES+=3Dusr/include/libusb20_compat10.h -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_LIBS+=3Dusr/lib32/libusb20.so.1 OLD_FILES+=3Dusr/lib32/libusb20.a OLD_FILES+=3Dusr/lib32/libusb20.so OLD_FILES+=3Dusr/lib32/libusb20_p.a -.endif # 20090226: libmp(3) functions renamed OLD_LIBS+=3Dusr/lib/libmp.so.6 -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_LIBS+=3Dusr/lib32/libmp.so.6 -.endif # 20090223: changeover of USB stacks OLD_FILES+=3Dusr/include/dev/usb2/include/ufm2_ioctl.h OLD_FILES+=3Dusr/include/dev/usb2/include/urio2_ioctl.h @@ -1242,9 +1214,7 @@ OLD_LIBS+=3Dusr/lib/libkafs5.so.9 OLD_LIBS+=3Dusr/lib/libkrb5.so.9 OLD_LIBS+=3Dusr/lib/libroken.so.9 -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_LIBS+=3Dusr/lib32/libgssapi.so.9 -.endif # 20080420: Symbol card support dropped OLD_FILES+=3Dusr/include/dev/wi/spectrum24t_cf.h # 20080420: awi removal @@ -1271,10 +1241,8 @@ OLD_FILES+=3Dusr/share/man/man2/kse_switchin.2.gz OLD_FILES+=3Dusr/share/man/man2/kse_thr_interrupt.2.gz OLD_FILES+=3Dusr/share/man/man2/kse_wakeup.2.gz -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_FILES+=3Dusr/lib32/libkse.so OLD_LIBS+=3Dusr/lib32/libkse.so.3 -.endif # 20080220: geom_lvm rename to geom_linux_lvm OLD_FILES+=3Dusr/share/man/man4/geom_lvm.4.gz # 20080126: oldcard.4 removal @@ -1294,11 +1262,9 @@ OLD_FILES+=3Dusr/lib/libkse.a OLD_FILES+=3Dusr/lib/libkse_p.a OLD_FILES+=3Dusr/lib/libkse_pic.a -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_FILES+=3Dusr/lib32/libkse.a OLD_FILES+=3Dusr/lib32/libkse_p.a OLD_FILES+=3Dusr/lib32/libkse_pic.a -.endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=3Dusr/include/sys/_elf_solaris.h # 20071125: Renamed to pmc_get_msr() @@ -1398,12 +1364,10 @@ OLD_DIRS+=3Dusr/include/netatm/uni OLD_DIRS+=3Dusr/include/netatm OLD_DIRS+=3Dusr/share/examples/atm -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_FILES+=3Dusr/lib32/libatm.a OLD_FILES+=3Dusr/lib32/libatm.so OLD_LIBS+=3Dusr/lib32/libatm.so.5 OLD_FILES+=3Dusr/lib32/libatm_p.a -.endif # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} =3D=3D "i386" OLD_FILES+=3Dusr/include/machine/i4b_cause.h @@ -1488,7 +1452,6 @@ OLD_LIBS+=3Dusr/lib/snmp_mibII.so.4 OLD_LIBS+=3Dusr/lib/snmp_netgraph.so.4 OLD_LIBS+=3Dusr/lib/snmp_pf.so.4 -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_LIBS+=3Dusr/lib32/libalias.so.5 OLD_LIBS+=3Dusr/lib32/libbsnmp.so.3 OLD_LIBS+=3Dusr/lib32/libdialog.so.5 @@ -1523,7 +1486,6 @@ OLD_LIBS+=3Dusr/lib32/pam_ssh.so.3 OLD_LIBS+=3Dusr/lib32/pam_tacplus.so.3 OLD_LIBS+=3Dusr/lib32/pam_unix.so.3 -.endif # 20070613: IPX over IP tunnel removal OLD_FILES+=3Dusr/include/netipx/ipx_ip.h # 20070605: sched_core removal @@ -1593,7 +1555,6 @@ OLD_LIBS+=3Dusr/lib/libypclnt.so.2 OLD_LIBS+=3Dusr/lib/snmp_bridge.so.3 OLD_LIBS+=3Dusr/lib/snmp_hostres.so.3 -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_LIBS+=3Dusr/lib32/libatm.so.4 OLD_LIBS+=3Dusr/lib32/libbegemot.so.2 OLD_LIBS+=3Dusr/lib32/libbluetooth.so.2 @@ -1652,7 +1613,6 @@ OLD_LIBS+=3Dusr/lib32/libwrap.so.4 OLD_LIBS+=3Dusr/lib32/libypclnt.so.2 OLD_LIBS+=3Dusr/lib32/libz.so.3 -.endif # 20070519: GCC 4.2 OLD_FILES+=3Dusr/bin/f77 OLD_FILES+=3Dusr/bin/protoize @@ -1899,9 +1859,7 @@ OLD_FILES+=3Dusr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 OLD_LIBS+=3Dusr/lib/libarchive.so.3 -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_LIBS+=3Dusr/lib32/libarchive.so.3 -.endif # 20070301: remove addr2ascii and ascii2addr OLD_FILES+=3Dusr/share/man/man3/addr2ascii.3.gz OLD_FILES+=3Dusr/share/man/man3/ascii2addr.3.gz @@ -1918,14 +1876,12 @@ OLD_FILES+=3Dusr/lib/libmytinfow.a OLD_FILES+=3Dusr/lib/libmytinfow.so OLD_FILES+=3Dusr/lib/libmytinfow_p.a -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_FILES+=3Dusr/lib32/libmytinfo.a OLD_FILES+=3Dusr/lib32/libmytinfo.so OLD_FILES+=3Dusr/lib32/libmytinfo_p.a OLD_FILES+=3Dusr/lib32/libmytinfow.a OLD_FILES+=3Dusr/lib32/libmytinfow.so OLD_FILES+=3Dusr/lib32/libmytinfow_p.a -.endif # 20070128: remove vnconfig OLD_FILES+=3Dusr/sbin/vnconfig # 20070127: remove bpf_compat.h @@ -5269,40 +5225,32 @@ OLD_LIBS+=3Dusr/lib/libkafs5.so.8 OLD_LIBS+=3Dusr/lib/libkrb5.so.8 OLD_LIBS+=3Dusr/lib/libobjc.so.2 -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_LIBS+=3Dusr/lib32/libgssapi.so.8 OLD_LIBS+=3Dusr/lib32/libobjc.so.2 -.endif # 20070519: GCC 4.2 OLD_LIBS+=3Dusr/lib/libg2c.a OLD_LIBS+=3Dusr/lib/libg2c.so OLD_LIBS+=3Dusr/lib/libg2c.so.2 OLD_LIBS+=3Dusr/lib/libg2c_p.a OLD_LIBS+=3Dusr/lib/libgcc_pic.a -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_LIBS+=3Dusr/lib32/libg2c.a OLD_LIBS+=3Dusr/lib32/libg2c.so OLD_LIBS+=3Dusr/lib32/libg2c.so.2 OLD_LIBS+=3Dusr/lib32/libg2c_p.a OLD_LIBS+=3Dusr/lib32/libgcc_pic.a -.endif # 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade OLD_LIBS+=3Dlib/libcrypto.so.4 OLD_LIBS+=3Dusr/lib/libssl.so.4 -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_LIBS+=3Dusr/lib32/libcrypto.so.4 OLD_LIBS+=3Dusr/lib32/libssl.so.4 -.endif # 20060521: gethostbyaddr(3) ABI change OLD_LIBS+=3Dusr/lib/libroken.so.8 OLD_LIBS+=3Dlib/libatm.so.3 OLD_LIBS+=3Dlib/libc.so.6 OLD_LIBS+=3Dlib/libutil.so.5 -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_LIBS+=3Dusr/lib32/libatm.so.3 OLD_LIBS+=3Dusr/lib32/libc.so.6 OLD_LIBS+=3Dusr/lib32/libutil.so.5 -.endif # 20060413: shared library moved to /usr/lib OLD_LIBS+=3Dlib/libgpib.so.1 # 20060413: libpcap.so.4 moved to /lib/ @@ -5316,12 +5264,10 @@ OLD_LIBS+=3Dusr/lib/libc_r.so OLD_LIBS+=3Dusr/lib/libc_r.so.7 OLD_LIBS+=3Dusr/lib/libc_r_p.a -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_LIBS+=3Dusr/lib32/libc_r.a OLD_LIBS+=3Dusr/lib32/libc_r.so OLD_LIBS+=3Dusr/lib32/libc_r.so.7 OLD_LIBS+=3Dusr/lib32/libc_r_p.a -.endif # 20050722: bump for 6.0-RELEASE OLD_LIBS+=3Dlib/libalias.so.4 OLD_LIBS+=3Dlib/libatm.so.2 @@ -5533,10 +5479,8 @@ OLD_LIBS+=3Dusr/lib/libarchive.so.2 OLD_LIBS+=3Dusr/lib/libbsnmp.so.1 OLD_LIBS+=3Dusr/lib/libc_r.so.6 -.if ${TARGET_ARCH} =3D=3D "amd64" OLD_LIBS+=3Dusr/lib32/libarchive.so.2 OLD_LIBS+=3Dusr/lib32/libc_r.so.6 -.endif OLD_LIBS+=3Dusr/lib/libcipher.so.2 OLD_LIBS+=3Dusr/lib/libgssapi.so.6 OLD_LIBS+=3Dusr/lib/libkse.so.1 --=20 wbr, pluknet
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAE-mSOK2gdiurZuw61K1_iyt8g65NPWp%2BtbpgkU-Xru_T%2BQEBg>