TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Use system libdir when searching for dynamically loaded libraries.

Browse Source 
This prevents finding an incorrect architecture on multi-arch systems.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8a859540c3)
v3.5.13-sru
Slávek Banko 6 years ago
parent 4e6b9128f7
commit cfa79f06e2
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
8 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File

12
CMakeLists.txt
Unescape View File

@ -124,6 +124,18 @@ if( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
endif( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
##### get the system's default path for libraries
tde_save_and_set( CMAKE_INSTALL_PREFIX "/usr" )
include( GNUInstallDirs OPTIONAL )
if( CMAKE_INSTALL_LIBDIR )
set( SYSTEM_LIBDIR "${CMAKE_INSTALL_LIBDIR}" )
else( )
set( SYSTEM_LIBDIR "lib${LIB_SUFFIX}" )
endif( )
tde_restore( CMAKE_INSTALL_PREFIX )
##### check for compiler capabilities ###########
include( CheckCXXCompilerFlag )

1
config.h.cmake
Unescape View File

@ -775,6 +775,7 @@
/* Suffix for lib directories */
#define KDELIBSUFF "@KDELIBSUFF@"
#define SYSTEM_LIBDIR "@SYSTEM_LIBDIR@"
/* The compiled in system configuration prefix */
#define KDESYSCONFDIR "@CONFIG_INSTALL_DIR@"

8
kdecore/ksocks.cpp
Unescape View File

@ -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

13
kdeprint/cups/cupsdconf2/cupsdconf.cpp
Unescape View File

@ -71,10 +71,15 @@ CupsdConf::CupsdConf()
//fontpath_ << (datadir_+"/fonts");
requestdir_ = findDir(TQStringList("/var/spool/cups")
<< "/var/cups");
serverbin_ = findDir(TQStringList("/usr/lib" KDELIBSUFF "/cups")
<< "/usr/local/lib" KDELIBSUFF "/cups"
<< "/opt/lib" KDELIBSUFF "/cups"
<< "/opt/local/lib" KDELIBSUFF "/cups");
serverbin_ = findDir(TQStringList()
<< "/usr/" SYSTEM_LIBDIR "/cups"
<< "/usr/lib/cups"
<< "/usr/local/" SYSTEM_LIBDIR "/cups"
<< "/usr/local/lib/cups"
<< "/opt/" SYSTEM_LIBDIR "/cups"
<< "/opt/lib/cups"
<< "/opt/local/" SYSTEM_LIBDIR "/cups"
<< "/opt/local/lib/cups");
serverfiles_ = findDir(TQStringList("/etc/cups")
<< "/usr/local/etc/cups");
tmpfiles_ = requestdir_+"/tmp";

27
kdeui/ksconfig.cpp
Unescape View File

@ -444,19 +444,24 @@ void KSpellConfig::getAvailDictsIspell () {
dictcombo->insertItem( i18n("ISpell Default") );
// dictionary path
TQFileInfo dir ("/usr/lib" KDELIBSUFF "/ispell");
if (!dir.exists() || !dir.isDir())
dir.setFile ("/usr/local/lib" KDELIBSUFF "/ispell");
if (!dir.exists() || !dir.isDir())
dir.setFile ("/usr/local/share/ispell");
if (!dir.exists() || !dir.isDir())
dir.setFile ("/usr/share/ispell");
if (!dir.exists() || !dir.isDir())
dir.setFile ("/usr/pkg/lib");
TQFileInfo dir;
TQStringList dirs;
dirs
<< "/usr/" SYSTEM_LIBDIR "/ispell"
<< "/usr/lib/ispell"
<< "/usr/local/" SYSTEM_LIBDIR "/ispell"
<< "/usr/local/lib/ispell"
<< "/usr/local/share/ispell"
<< "/usr/share/ispell"
<< "/usr/pkg/lib";
for (TQStringList::ConstIterator it=dirs.begin(); it != dirs.end(); ++it) {
dir.setFile(*it);
if (dir.exists() && dir.isDir()) {
break;
}
}
/* TODO get them all instead of just one of them.
* If /usr/local/lib exists, it skips the rest
if (!dir.exists() || !dir.isDir())
dir.setFile ("/usr/local/lib");
*/
if (!dir.exists() || !dir.isDir()) return;

41
kio/kssl/kopenssl.cc
Unescape View File

@ -28,7 +28,6 @@
#include <kconfig.h>
#include <kstaticdeleter.h>
#include <tqregexp.h>
#include <tqdir.h>
#include <stdio.h>
#include <unistd.h>
@ -324,7 +323,7 @@ KConfig *cfg;
#ifdef __OpenBSD__
{
TQString libname = findMostRecentLib("/usr/lib" KDELIBSUFF, "crypto");
TQString libname = findMostRecentLib("/usr/" SYSTEM_LIBDIR, "crypto");
if (!libname.isNull())
_cryptoLib = ll->globalLibrary(libname.latin1());
}
@ -349,13 +348,13 @@ KConfig *cfg;
#ifdef _AIX
<< "/opt/freeware/lib/"
#endif
<< "/usr/lib" KDELIBSUFF "/"
<< "/usr/ssl/lib" KDELIBSUFF "/"
<< "/usr/local/lib" KDELIBSUFF "/"
<< "/usr/local/openssl/lib" KDELIBSUFF "/"
<< "/usr/local/ssl/lib" KDELIBSUFF "/"
<< "/opt/openssl/lib" KDELIBSUFF "/"
<< "/lib" KDELIBSUFF "/"
<< "/usr/" SYSTEM_LIBDIR "/"
<< "/usr/ssl/" SYSTEM_LIBDIR "/"
<< "/usr/local/" SYSTEM_LIBDIR "/"
<< "/usr/local/openssl/" SYSTEM_LIBDIR "/"
<< "/usr/local/ssl/" SYSTEM_LIBDIR "/"
<< "/opt/openssl/" SYSTEM_LIBDIR "/"
<< "/" SYSTEM_LIBDIR "/"
<< "";
// FIXME: #define here for the various OS types to optimize
@ -408,18 +407,6 @@ KConfig *cfg;
tmpStr.replace(TQRegExp("\\(.*\\)"), "");
if (!access(tmpStr.latin1(), R_OK))
_cryptoLib = ll->globalLibrary(alib.latin1());
if (!_cryptoLib) {
// Multiarch triplet search
TQDir madir (*it);
TQStringList multiarchdirs = madir.entryList("*-*-*", TQDir::Dirs);
for (TQStringList::Iterator mait = multiarchdirs.begin(); mait != multiarchdirs.end(); ++mait ) {
TQString malib = *it + *mait + "/" + *shit;
TQString tmpStr(malib.latin1());
tmpStr.replace(TQRegExp("\\(.*\\)"), "");
if (!access(tmpStr.latin1(), R_OK))
_cryptoLib = ll->globalLibrary(malib.latin1());
}
}
if (_cryptoLib) break;
}
if (_cryptoLib) break;
@ -611,18 +598,6 @@ KConfig *cfg;
tmpStr.replace(TQRegExp("\\(.*\\)"), "");
if (!access(tmpStr.latin1(), R_OK))
_sslLib = ll->globalLibrary(alib.latin1());
if (!_sslLib) {
// Multiarch triplet search
TQDir madir (*it);
TQStringList multiarchdirs = madir.entryList("*-*-*", TQDir::Dirs);
for (TQStringList::Iterator mait = multiarchdirs.begin(); mait != multiarchdirs.end(); ++mait ) {
TQString malib = *it + *mait + "/" + *shit;
TQString tmpStr(malib.latin1());
tmpStr.replace(TQRegExp("\\(.*\\)"), "");
if (!access(tmpStr.latin1(), R_OK))
_sslLib = ll->globalLibrary(malib.latin1());
}
}
if (_sslLib) break;
}
if (_sslLib) break;

1
kspell2/plugins/ispell/CMakeLists.txt
Unescape View File

@ -12,6 +12,7 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kspell2
${CMAKE_SOURCE_DIR}/kdecore

4
kspell2/plugins/ispell/ispell_checker.cpp
Unescape View File

@ -29,6 +29,8 @@
* do so, delete this exception statement from your version.
*/
#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -53,7 +55,9 @@ typedef struct str_ispell_map
} IspellMap;
static const char *ispell_dirs [] = {
"/usr/" SYSTEM_LIBDIR "/ispell",
"/usr/lib/ispell",
"/usr/local/" SYSTEM_LIBDIR "/ispell",
"/usr/local/lib/ispell",
"/usr/local/share/ispell",
"/usr/share/ispell",

Write Preview
Loading…
Cancel
Save