Date: Thu, 25 Dec 2014 12:21:13 +0200 From: Konstantin Belousov <kostikbel@gmail.com> To: Garrett Cooper <yaneurabeya@gmail.com> Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, Alfred Perlstein <alfred@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org> Subject: Re: svn commit: r276195 - in head: . lib/libxo Message-ID: <20141225102113.GE1754@kib.kiev.ua> In-Reply-To: <E41F844E-647A-485F-BBD1-D23628C587B9@gmail.com> References: <201412250315.sBP3FvS6025641@svn.freebsd.org> <8F2C5A52-365F-4AE9-B60F-78CE7122F5B7@gmail.com> <549B8AD4.40703@freebsd.org> <E41F844E-647A-485F-BBD1-D23628C587B9@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Dec 24, 2014 at 11:04:01PM -0800, Garrett Cooper wrote: > > > On Dec 24, 2014, at 19:56, Alfred Perlstein <alfred@freebsd.org> wrote: > > > > > > On 12/24/14 7:36 PM, Garrett Cooper wrote: > >>> On Dec 24, 2014, at 19:15, Alfred Perlstein <alfred@FreeBSD.org> wrote: > >>> > >>> Author: alfred > >>> Date: Thu Dec 25 03:15:56 2014 > >>> New Revision: 276195 > >>> URL: https://svnweb.freebsd.org/changeset/base/276195 > >>> > >>> Log: > >>> Move libxo to /lib > >>> > >>> Update ObsoleteFiles to reflect libxo move. > >>> > >>> Reviewed by: ngie > >>> Differential Revision: https://reviews.freebsd.org/D1370 > >>> > >>> Modified: > >>> head/ObsoleteFiles.inc > >>> head/lib/libxo/Makefile > >>> > >>> Modified: head/ObsoleteFiles.inc > >>> ============================================================================== > >>> --- head/ObsoleteFiles.inc Thu Dec 25 02:17:17 2014 (r276194) > >>> +++ head/ObsoleteFiles.inc Thu Dec 25 03:15:56 2014 (r276195) > >>> @@ -38,6 +38,9 @@ > >>> # xargs -n1 | sort | uniq -d; > >>> # done > >>> > >>> +# 20141224: libxo moved to /lib > >>> +OLD_FILES+=usr/lib/libxo.a > >>> +OLD_FILES+=usr/lib/libxo_p.a > >> This should actually be the .so file only. Static libraries are always in /usr/lib . > >> > >> Sorry for not being explicit about this (I'm currently writing from the boonies so bandwidth is limited) :/. > >> > >> > > > > I think the .so gets clobbered with a symlink, so it should be fine? > > > > Meaning that after I moved the lib to /lib this is what I see in /usr/lib: > > /usr/src/contrib/libxo % ls -l /usr/lib/libxo* > > -r--r--r-- 1 root wheel 83764 Dec 24 19:31 /usr/lib/libxo.a > > lrwxr-xr-x 1 root wheel 15 Dec 24 19:31 /usr/lib/libxo.so -> /lib/libxo.so.0 > > -r--r--r-- 1 root wheel 95164 Dec 24 19:31 /usr/lib/libxo_p.a > > > > > > Or should I reference it explicitly? > > > > What is the end result here? > > There isn't a leftover versioned .so in /usr/lib ? usr/lib/libxo.so.0 (without leading slash) must go into OLD_LIBS. It is all explained in the first paragraph of the file comment.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20141225102113.GE1754>