From owner-svn-ports-all@FreeBSD.ORG Mon May 19 13:40:13 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 57A4D86C; Mon, 19 May 2014 13:40:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 104112CDF; Mon, 19 May 2014 13:40:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4JDeCel043276; Mon, 19 May 2014 13:40:12 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4JDeCm7043275; Mon, 19 May 2014 13:40:12 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201405191340.s4JDeCm7043275@svn.freebsd.org> From: Tijl Coosemans Date: Mon, 19 May 2014 13:40:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354539 - head/editors/abiword X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Mon, 19 May 2014 13:40:13 -0000 Author: tijl Date: Mon May 19 13:40:12 2014 New Revision: 354539 URL: http://svnweb.freebsd.org/changeset/ports/354539 QAT: https://qat.redports.org/buildarchive/r354539/ Log: Add some substitutions to ensure that plugins are linked with libabiword from the work or stage directory instead of a previously installed library. In pseudo code: s,PLUGIN_LIBS="$PLUGIN_LIBS -Lsrc -labiword", PLUGIN_LIBS="src/libabiword.la $PLUGIN_LIBS", s,foo_LIBS="$foo_LIBS $PLUGIN_LIBS", foo_LIBS="$PLUGIN_LIBS $foo_LIBS", The initial value of PLUGIN_LIBS may contain -L/usr/local/lib so it would have to come after -Lsrc, but -Lsrc is not correct when libtool relinks plugins during staging so use src/libabiword.la and let libtool figure out what flags are needed. Secondly, switch around foo_LIBS and PLUGIN_LIBS because foo_LIBS may contain -L/usr/local/lib. Modified: head/editors/abiword/Makefile Modified: head/editors/abiword/Makefile ============================================================================== --- head/editors/abiword/Makefile Mon May 19 13:31:40 2014 (r354538) +++ head/editors/abiword/Makefile Mon May 19 13:40:12 2014 (r354539) @@ -183,6 +183,21 @@ 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 +# The following substitutions ensure that plugins are linked with libabiword +# from the work or stage directory instead of a previously installed library. +# In pseudo code: +# s,PLUGIN_LIBS="$PLUGIN_LIBS -Lsrc -labiword", +# PLUGIN_LIBS="src/libabiword.la $PLUGIN_LIBS", +# s,foo_LIBS="$foo_LIBS $PLUGIN_LIBS", +# foo_LIBS="$PLUGIN_LIBS $foo_LIBS", +# The initial value of PLUGIN_LIBS may contain -L/usr/local/lib so it would +# have to come after -Lsrc, but -Lsrc is not correct when libtool relinks +# plugins during staging so use src/libabiword.la and let libtool figure out +# what flags are needed. Secondly, switch around foo_LIBS and PLUGIN_LIBS +# because foo_LIBS may contain -L/usr/local/lib. + @${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