From owner-svn-src-all@FreeBSD.ORG Thu Dec 25 10:21:19 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7F2CC3B9; Thu, 25 Dec 2014 10:21:19 +0000 (UTC) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 231A03F6C; Thu, 25 Dec 2014 10:21:18 +0000 (UTC) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id sBPALD7c068655 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 25 Dec 2014 12:21:13 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua sBPALD7c068655 Received: (from kostik@localhost) by tom.home (8.14.9/8.14.9/Submit) id sBPALDis068654; Thu, 25 Dec 2014 12:21:13 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 25 Dec 2014 12:21:13 +0200 From: Konstantin Belousov To: Garrett Cooper Subject: Re: svn commit: r276195 - in head: . lib/libxo Message-ID: <20141225102113.GE1754@kib.kiev.ua> References: <201412250315.sBP3FvS6025641@svn.freebsd.org> <8F2C5A52-365F-4AE9-B60F-78CE7122F5B7@gmail.com> <549B8AD4.40703@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on tom.home Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , Alfred Perlstein , "src-committers@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Dec 2014 10:21:19 -0000 On Wed, Dec 24, 2014 at 11:04:01PM -0800, Garrett Cooper wrote: > > > On Dec 24, 2014, at 19:56, Alfred Perlstein wrote: > > > > > > On 12/24/14 7:36 PM, Garrett Cooper wrote: > >>> On Dec 24, 2014, at 19:15, Alfred Perlstein 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.