diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-02-23 16:35:21 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-02-27 20:20:20 +0100 |
| commit | cfa79f06e225942d19903b52cc2ed74e966d3c3f (patch) | |
| tree | 9b9cd88f300a81e80e511bba11d59c224f2a2c93 /kdecore | |
| parent | 4e6b9128f722d7a45188b2c2fc3ecdb887de6cc9 (diff) | |
| download | tdelibs-cfa79f06e225942d19903b52cc2ed74e966d3c3f.tar.gz tdelibs-cfa79f06e225942d19903b52cc2ed74e966d3c3f.zip | |
Use system libdir when searching for dynamically loaded libraries.
This prevents finding an incorrect architecture on multi-arch systems.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8a859540c3cb306844288144a06028dc302408d6)
Diffstat (limited to 'kdecore')
| -rw-r--r-- | kdecore/ksocks.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kdecore/ksocks.cpp b/kdecore/ksocks.cpp index e596c50d9..0f05c17e3 100644 --- a/kdecore/ksocks.cpp +++ b/kdecore/ksocks.cpp @@ -254,13 +254,13 @@ KSocks::KSocks(KConfigBase *config) : _socksLib(0L), _st(0L) { return; _libPaths << "" - << "/usr/lib" KDELIBSUFF "/" + << "/usr/" SYSTEM_LIBDIR "/" << "/usr/lib/" - << "/usr/local/lib" KDELIBSUFF "/" + << "/usr/local/" SYSTEM_LIBDIR "/" << "/usr/local/lib/" - << "/usr/local/socks5/lib" KDELIBSUFF "/" + << "/usr/local/socks5/" SYSTEM_LIBDIR "/" << "/usr/local/socks5/lib/" - << "/opt/socks5/lib" KDELIBSUFF "/" + << "/opt/socks5/" SYSTEM_LIBDIR "/" << "/opt/socks5/lib/"; _libNames << "libsocks.so" // Dante << "libdsocksd.so.0" // Dante 1.1.14-2 on |