From ffbef41617a13ad3e9a79df15b02c3ae51cee136 Mon Sep 17 00:00:00 2001 From: tijl 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) --- archivers/rpm4/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'archivers') diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index 23e75a064bd4..4f5e27345e04 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -57,9 +57,7 @@ CONFIGURE_ENV+= LUA_CFLAGS=-I${LUA_INCDIR} \ PLIST_SUB+= VERSION=${PORTVERSION} post-patch: - ${REINPLACE_CMD} \ - -e '/_LDADD =/s/=/= @LTLIBINTL@/' \ - -e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in + ${REINPLACE_CMD} -e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in ${REINPLACE_CMD} -e 's/(hpux)/& || defined(__FreeBSD__)/' \ ${WRKSRC}/misc/fts.? ${REINPLACE_CMD} -e 's/ __GLIBC__.*/& || defined(__FreeBSD__)/' \ -- cgit