From 3e4a806167fd4921ccc48623317dc31d7ab4f276 Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Sun, 22 Jun 2014 10:44:29 +0000 Subject: Add 4 new sed commands to USES=libtool. The first two apply some of the changes that Debian made to their libtool. The first command applies to libtool versions 1.4 and up. The second command is somewhat more elaborate but essentially it uses the sed hold space to move an "elif...fi" block down. It applies to 2.x. Together these reduce overlinking to unpatched .la files (from ports that don't have USES=libtool yet but also .la files in the work directory). The third and fourth command fix relinking. During staging libtool may relink libA when it links to another library in the work directory libB. The reason is that libA created during build phase has its runpath set to the location of libB in the work directory. This allows running an executable that links to libA from within the work directory. The relink removes this extra runpath. When libtool relinks libA it replaces "libB.la" on the linker command line with "-L${STAGEDIR}${PREFIX}/lib -lB" with the intention to link to libB in the stage directory but this -L flag isn't necessarily the first so another libB may be linked instead. The two sed commands make relink the same as a normal link. This means libtool will relink with libraries from the work directory using a path similar to "../srcB/.libs/libB.so" without -L flags. This applies to libtool 1.4 and up. Earlier versions don't seem to relink libraries. (This fixes ports like devel/apr1 so they link with freshly built libraries instead of installed libraries.) Fix all ports with missing libraries. Additionally: archivers/rpm4: USES=patchfix. databases/gdbm: INSTALL_TARGET=install-strip. devel/gnome-vfs: remove patch that doesn't change anything. devel/ois: INSTALL_TARGET=install-strip and use standard USE_AUTOTOOLS. devel/zziplib: INSTALL_TARGET=install-strip, MAKE_CMD. multimedia/mjpegtools: remove USE_AUTOTOOLS, use modern compiler on i386 instead of disabling optimisations. net/libnetdude: disable static plugins. PR: 190941 Exp-run: antoine Approved by: portmgr (antoine) --- graphics/libgnomecanvas/files/patch-demos-Makefile.in | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 graphics/libgnomecanvas/files/patch-demos-Makefile.in (limited to 'graphics/libgnomecanvas') diff --git a/graphics/libgnomecanvas/files/patch-demos-Makefile.in b/graphics/libgnomecanvas/files/patch-demos-Makefile.in new file mode 100644 index 000000000000..348748913ea3 --- /dev/null +++ b/graphics/libgnomecanvas/files/patch-demos-Makefile.in @@ -0,0 +1,10 @@ +--- demos/Makefile.in.orig ++++ demos/Makefile.in +@@ -255,6 +255,7 @@ + + LDADD = \ + $(top_builddir)/libgnomecanvas/libgnomecanvas-2.la \ ++ $(LIBGNOMECANVAS_LIBS) \ + $(INTLLIBS) + + canvas_demo_SOURCES = \ -- cgit v1.2.3