Use system libdir when searching for dynamically loaded libraries #25
Слито
SlavekB
слито 1 коммит(ов) из feat/search-libs-in-system-libdir
в master
5 лет назад
Загрузка…
Ссылка в новой задаче
Пока нет содержимого.
Удалить ветку 'feat/search-libs-in-system-libdir'
Удаление ветки НЕОБРАТИМО. Действие никак нельзя отменить.
To dynamically load libraries, we need to identify the directory in which the library will be searched for.
Here are different ways to deal with multi-arch in individual distributions. Some consider only 64 × 32 bits and use lib64 × lib (RedHat, Slackware), some consider full multi-arch and use lib/x86_64-linux-gnu, lib/i386-linux-gnu, lib/arm-linux-gnueabihf,… (Debian, Ubuntu).
Currently,
KDELIBSUFF
was used, which assumed the '64' setting for lib64. However, this is not enough for a full multi-arch case. When searching for an SSL libraries, it is currently looking for all thelib/*-*-*
directories, which can lead to finding a library that is for the other architecture.The proposed patch uses the fact that CMake rules contain the default path for libraries. Instead of
KDELIBSUFF
,SYSTEM_LIBDIR
is now used, which is set according to the CMake value. As a result, on fully multi-arch systems, a directory for the right architecture will be searched.8a859540c3
.