From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 50A547F3F for ; Mon, 11 Aug 2014 13:02:39 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay3.corp.sgi.com (Postfix) with ESMTP id D0BE8AC002 for ; Mon, 11 Aug 2014 11:02:35 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) by cuda.sgi.com with ESMTP id DAyAkUnRpvkKzfzx (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Mon, 11 Aug 2014 11:02:33 -0700 (PDT) Date: Mon, 11 Aug 2014 11:02:27 -0700 From: Christoph Hellwig Subject: Re: symlink loop for /lib64/libhandle.so Message-ID: <20140811180227.GA30281@infradead.org> References: <1404898212.7231.12.camel@jtulak> <20140709132836.GA65226@bfoster.bfoster> <20140710134851.GA26652@infradead.org> <1405009872.31068.22.camel@jtulak> <53BEC1E7.1070904@sandeen.net> <1405075678.28203.56.camel@jtulak> <1405325087.3196.6.camel@jtulak> <20140714082607.GA19882@infradead.org> <20140715154857.GA14716@infradead.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20140715154857.GA14716@infradead.org> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: Jan ??ul??k , Dave Chinner Cc: Brian Foster , Eric Sandeen , XFS mail list Dave, can you pick up this patch for xfsprogs? On Tue, Jul 15, 2014 at 08:48:57AM -0700, Christoph Hellwig wrote: > Hi Jan, > > there were still some small isues with the patch format, I've attached > a version of your patch that has the expected format. > > Note that I also changed it to only check the canonical names instead of > testing the passed in one and the one readlink was called on. This > should be enough I think, but please test that it still works for you. > > Thanks for tracking this down! > From: Jan Tulak > Subject: [PATCH] libhandle: fix instalation for symlinked /usr > > Canonicalize the pathnames for PKG_LIB_DIR and PKG_ROOT_LIB_DIR before > checking if they are the same. This is required for Fedora which doesn't > have a separate /usr/lib directory anymore. > > Reported-by: Jan Tulak > Signed-off-by: Jan Tulak > > diff --git a/include/buildmacros b/include/buildmacros > index 7a01880..4e4e8fa 100644 > --- a/include/buildmacros > +++ b/include/buildmacros > @@ -76,10 +76,11 @@ INSTALL_LTLIB_DEV = \ > ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ > ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ > ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ > - if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \ > - ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ > - ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ > - ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ > + if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \ > + "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))"; ]; then \ > + ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ > + ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ > + ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ > fi > else > INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) > _______________________________________________ > xfs mailing list > xfs@oss.sgi.com > http://oss.sgi.com/mailman/listinfo/xfs ---end quoted text--- _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs