SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@1012 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2020-04-12 09:18:11 +00:00
parent b5f24b656e
commit eee93e1783
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/DeployMacros.cmake
View File

@@ -672,7 +672,7 @@ macro(deploy_target _T)
string(REPLACE "${ANDROID_SYSROOT_${ANDROID_ABI}}" "${ANDROID_SYSROOT_${_a}}" _lib_${_a} "${_lib_}")
#message("search = ${_a_prefix}/lib")
__make_copy(_CMD_ _empty _lib_${_a} "${_AGD}/libs/${_a}")
set(_CMD_ ${_CMD_} COMMAND deploy_tool ${_VERB} ${_OPTIONS} -L "\"${CMAKE_READELF}\"" -s "\"${_a_prefix}/lib\"" -o "\"${_AGD}/libs/${_a}\"" --ignore "\"c:m:dl\"" "\"${_AGD}/libs/${_a}/lib${_AT}_${_a}.so\"" ${_ADD_DEPS})
set(_CMD_ ${_CMD_} COMMAND deploy_tool ${_VERB} ${_OPTIONS} -W "\"${CMAKE_OBJDUMP}\"" -s "\"${_a_prefix}/lib\"" -o "\"${_AGD}/libs/${_a}\"" --ignore "\"c:m:dl\"" "\"${_AGD}/libs/${_a}/lib${_AT}_${_a}.so\"" ${_ADD_DEPS})
#message("c++_${_a} -> ${_lib_${_a}}")
endif()
endforeach()

12
utils/deploy_tool/main.cpp
View File

@@ -182,16 +182,24 @@ void procLdd(PIString file, bool ext_lib = false, int cur_depth = 0) {
if (!objdump.isEmpty()) {
cmd = objdump + " -p " + file;
cmd += " | grep \"DLL Name:\"";
lines = execute(cmd).split("\n");
cmd = objdump + " -p " + file;
cmd += " | grep \"NEEDED\"";
lines << execute(cmd).split("\n");
cmd.clear();
}
if (!otool.isEmpty()) {
cmd = otool + " -L " + file;
cmd += " | grep -o \".*(\"";
}
//piCout << cmd;
lines = execute(cmd).split("\n");
if (!cmd.isEmpty())
lines = execute(cmd).split("\n");
if (!objdump.isEmpty()) {
piForeach (PIString & l, lines) {
l.trim().cutLeft(9).trim();
l.trim();
if (l.startsWith("DLL")) l.cutLeft(9).trim();
else l.cutLeft(6).trim();
l.append('.').prepend('.');
}
}