Date: Sun, 18 May 2014 18:14:13 +0200 From: Tijl Coosemans <tijl@FreeBSD.org> To: Koop Mast <kwm@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org 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>
next in thread | previous in thread | raw e-mail | index | archive | help
--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" <ohartman@zedat.fu-berlin.de> 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 <bsd.port.mk> --MP_/EQ+YtYcy=zOFrRfXTyKXP7B--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140518181413.5e4f21bc>