diff options
| author | tijl <tijl@FreeBSD.org> | 2014-07-23 18:28:03 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2014-07-23 18:28:03 +0800 |
| commit | ffbef41617a13ad3e9a79df15b02c3ae51cee136 (patch) | |
| tree | 544858c7e8531f55637ace19f7fe9ce4ac601ede /Mk | |
| parent | be5687fcd4aa53facc12b059c5a25986711524cd (diff) | |
| download | freebsd-ports-gnome-ffbef41617a13ad3e9a79df15b02c3ae51cee136.tar.gz freebsd-ports-gnome-ffbef41617a13ad3e9a79df15b02c3ae51cee136.tar.zst freebsd-ports-gnome-ffbef41617a13ad3e9a79df15b02c3ae51cee136.zip | |
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)
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/libtool.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Mk/Uses/libtool.mk b/Mk/Uses/libtool.mk index 75ce5c6ff343..d99b2f07765d 100644 --- a/Mk/Uses/libtool.mk +++ b/Mk/Uses/libtool.mk @@ -35,10 +35,6 @@ patch-libtool: @${FIND} ${WRKDIR} -type f -name ltmain.sh | \ ${XARGS} ${REINPLACE_CMD} \ - -e '/link) libs=/s/ $$dependency_libs//' \ - -e '/elif.*linkmode.*prog.*linkmode.*lib/,/continue/ { \ - /elif/,/fi/ { /elif/ { h; d; }; H; d; }; \ - /continue/ { H; g; }; }' \ -e '/if.*linkmode.*prog.*mode.*!= relink/s/if.*;/if :;/'\ -e '/if.*linkmode.*prog.*mode.* = relink/s/||.*;/;/' \ -e 's/|-p|-pg|/|-B*|-p|-pg|/' |