From c958a485819003ec24c1ea1b01940ea7c953115e Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Wed, 23 Jul 2014 10:28:03 +0000 Subject: Remove two libtool fixes from Mk/Uses/libtool.mk. They don't always work when an older version of a package is installed. This is the case when an executable links with installed libraries and with uninstalled libraries that link with other uninstalled libraries. For each of the directly linked libraries the executable will have an rpath (/usr/local/lib for the installed libraries and a path under WRKDIR for each of the uninstalled libraries), but not for the indirect libraries. Both ld(1) and rtld(1) search the rpath of the executable first before any rpath of libraries, so the indirectly linked libraries will be found in /usr/local/lib if they are installed instead of in WRKDIR. With this commit executables will overlink with uninstalled indirect libraries again so their location is added to the rpath of the executable. This partially reverts r358784. PR: 191611 Approved by: portmgr (bapt) --- x11-toolkits/gdl/Makefile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'x11-toolkits/gdl') diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile index c1b0b3462254..fe51f85de348 100644 --- a/x11-toolkits/gdl/Makefile +++ b/x11-toolkits/gdl/Makefile @@ -19,8 +19,4 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip -post-patch: - @${REINPLACE_CMD} '/^test_dock_LDADD =/s/$$/ $$(GDL_DEPENDENCIES_LIBS)/' \ - ${WRKSRC}/gdl/Makefile.in - .include -- cgit v1.2.3