From owner-svn-ports-all@FreeBSD.ORG Sat May 10 16:48:23 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4DBBCD05 for ; Sat, 10 May 2014 16:48:23 +0000 (UTC) Received: from b2bfep16.mx.upcmail.net (b2bfep16.mx.upcmail.net [62.179.121.61]) by mx1.freebsd.org (Postfix) with ESMTP id 8FD842F0 for ; Sat, 10 May 2014 16:48:21 +0000 (UTC) Received: from edge12.upcmail.net ([192.168.13.82]) by b2bfep16-int.chello.at (InterMail vM.8.01.05.05 201-2260-151-110-20120111) with ESMTP id <20140510164813.DMDY939.b2bfep16-int.chello.at@edge12.upcmail.net> for ; Sat, 10 May 2014 18:48:13 +0200 Received: from iznogoud.viz ([91.119.56.164]) by edge12.upcmail.net with edge id 0GoC1o00P3YbPKv0CGoDJE; Sat, 10 May 2014 18:48:13 +0200 X-SourceIP: 91.119.56.164 Received: from wolfgang by iznogoud.viz with local (Exim 4.82 (FreeBSD)) (envelope-from ) id 1WjARY-000DzQ-OP; Sat, 10 May 2014 18:48:12 +0200 From: Wolfgang Jenkner To: Sunpoet Po-Chuan Hsieh Subject: Re: svn commit: r353249 - in head: games/netradiant graphics/GraphicsMagick13 graphics/ImageMagick graphics/gdal graphics/gstreamer1-plugins-webp graphics/ida graphics/imageworsener graphics/leptonica ... Date: Sat, 10 May 2014 18:39:45 +0200 References: <201405080325.s483P6OQ053997@svn.freebsd.org> Message-ID: <85tx8xlgvn.fsf@iznogoud.viz> User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.4.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2014 16:48:23 -0000 On Thu, May 08 2014, Sunpoet Po-Chuan Hsieh wrote: > Modified: head/graphics/webp/Makefile [...] > LDFLAGS+= -L${LOCALBASE}/lib [...] > Modified: head/graphics/webp/pkg-plist [...] > -lib/libwebp.la > lib/libwebp.so > -lib/libwebp.so.4 > +lib/libwebp.so.5 > +lib/libwebp.so.5.0.0 [...] > -lib/libwebpdemux.la > lib/libwebpdemux.so > -lib/libwebpdemux.so.0 > +lib/libwebpdemux.so.1 > +lib/libwebpdemux.so.1.0.0 Updating from webp-0.3.1_5 to webp-0.4.0 appeared to succeed, but $ ldd /usr/local/lib/libwebpdemux.so.1 /usr/local/lib/libwebpdemux.so.1: libwebp.so.4 => /usr/local/lib/compat/pkg/libwebp.so.4 (0x801603000) libthr.so.3 => /lib/libthr.so.3 (0x801858000) libc.so.7 => /lib/libc.so.7 (0x80081e000) libm.so.5 => /lib/libm.so.5 (0x801a7d000) $ So, in the staging phase, libtool picks up the old libwebp.so.4 instead of linking to the new libwebp.so.5. Now, while there seem to be some limitations in libtool's support for staging - see the explanation of the -inst-prefix-dir switch in the `(libtool) Install mode' info node - I don't understand if they apply here. In any case, the following patch seems to be a work-around, at least. Index: webp/Makefile =================================================================== --- webp/Makefile (revision 353374) +++ webp/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= webp PORTVERSION= 0.4.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE DISTNAME= lib${PORTNAME}-${PORTVERSION} @@ -24,7 +25,11 @@ CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib +# While staging, trick libtool into linking libwebp(de)?mux with the +# already staged libwebp, not with some previously installed one. +# Those LDFLAGS end up in the *.la files, but we don't install them +# anyway;-) +LDFLAGS+= -L${STAGEDIR}${PREFIX}/lib -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-libwebpdecoder \ --enable-libwebpdemux \ --enable-libwebpmux \