From owner-svn-ports-head@FreeBSD.ORG Sun May 18 16:14:21 2014 Return-Path: Delivered-To: svn-ports-head@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 8DA0B23A; Sun, 18 May 2014 16:14:21 +0000 (UTC) Received: from mailrelay003.isp.belgacom.be (mailrelay003.isp.belgacom.be [195.238.6.53]) by mx1.freebsd.org (Postfix) with ESMTP id 0EDA22665; Sun, 18 May 2014 16:14:19 +0000 (UTC) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: At4GAAfceFNbsWnc/2dsb2JhbABZgwZPS8QWAYEJF3SCJQEBBVYeBRALDgYECSUPKh4GE4hFAQjRHxeOPxEHhEAEkTqIH4E+kV2DOTs Received: from 220.105-177-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.177.105.220]) by relay.skynet.be with ESMTP; 18 May 2014 18:14:14 +0200 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.8/8.14.8) with ESMTP id s4IGEDT9053838; Sun, 18 May 2014 18:14:13 +0200 (CEST) (envelope-from tijl@FreeBSD.org) Date: Sun, 18 May 2014 18:14:13 +0200 From: Tijl Coosemans To: Koop Mast Subject: Re: svn commit: r354416 - head/devel/goffice Message-ID: <20140518181413.5e4f21bc@kalimero.tijl.coosemans.org> In-Reply-To: <201405181306.s4ID6RCs085888@svn.freebsd.org> References: <201405181306.s4ID6RCs085888@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/EQ+YtYcy=zOFrRfXTyKXP7B" Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 May 2014 16:14:21 -0000 --MP_/EQ+YtYcy=zOFrRfXTyKXP7B Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline On Sun, 18 May 2014 13:06:27 +0000 (UTC) Koop Mast wrote: > Author: kwm > Date: Sun May 18 13:06:27 2014 > New Revision: 354416 > URL: http://svnweb.freebsd.org/changeset/ports/354416 > QAT: https://qat.redports.org/buildarchive/r354416/ > > Log: > Switch to USES=libtool:keepla instead of plain USES=libtool. > > Fixes: > editors/abiword: libtool: link: cannot find the library > `/usr/local/lib/libgoffice-0.8.la' or unhandled argument > `/usr/local/lib/libgoffice-0.8.la' > > PR: ports/189909 > Submitted by: "O. Hartmann" The problem is actually in abiword. It links with the installed libabiword.la which may still refer to libgoffice-0.8.la. The attached patch should fix that by replacing "-Lsrc -labiword" with "src/libabiword.la" in configure and switching around "PLUGIN_LIBS src/libabiword.la" because PLUGIN_LIBS contains -L/usr/local/lib. So if it's ok with you I'd like to revert this commit. Redports test: https://redports.org/buildarchive/20140518153400-35443/ During build phase "../../src/.libs/libabiword-2.8.so" is used now instead of "-labiword-2.8" and during install phase when several modules are relinked "-L$STAGEDIR" appears before "-L/usr/local/lib" now. --MP_/EQ+YtYcy=zOFrRfXTyKXP7B Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=abiword.patch Index: editors/abiword/Makefile =================================================================== --- editors/abiword/Makefile (revision 354407) +++ editors/abiword/Makefile (working copy) @@ -183,6 +183,9 @@ post-patch: @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ ${WRKSRC}/goffice-bits/goffice/app/goffice-app.h \ ${WRKSRC}/src/af/util/xp/ut_go_file.h - @${REINPLACE_CMD} -e 's|" == "|" = "|g' ${WRKSRC}/configure + @${REINPLACE_CMD} \ + -e "s|\$$PLUGIN_LIBS \"'-L\$${top_builddir}/src'\" -labiword-\$$ABIWORD_SERIES|\\\\\$${top_builddir}/src/libabiword-\$$ABIWORD_SERIES.la \$$PLUGIN_LIBS|" \ + -e "/_LIBS=/s|\"\\(.*\\)\"\\('\$${PLUGIN_LIBS}.*'\\)|\\2\" \\1\"|" \ + -e 's|" == "|" = "|g' ${WRKSRC}/configure .include --MP_/EQ+YtYcy=zOFrRfXTyKXP7B--