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@1049 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2020-04-16 15:45:35 +00:00
parent 7469e513c3
commit d2fe1964cb
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
utils/deploy_tool/main.cpp
View File

@@ -385,7 +385,6 @@ void patchNameTool() {
patch_list = input_files; patch_list = input_files;
patch_list << plugin_libs; patch_list << plugin_libs;
piForeach (PIString l, clibs) { piForeach (PIString l, clibs) {
piCout << "ALL:" << l;
fi.path = l; fi.path = l;
patch_list << (out_dir + fi.name()); patch_list << (out_dir + fi.name());
} }
@@ -410,7 +409,7 @@ void patchNameTool() {
PIString fl = findLib(libname), fname = frameworkName(sys_lib); PIString fl = findLib(libname), fname = frameworkName(sys_lib);
piCout << " check" << sys_lib << fl; piCout << " check" << sys_lib << fl;
PIString new_path; PIString new_path;
if (all_libs.contains(fl)) { if (all_libs.contains(fl) || all_libs.contains(libname)) {
new_path = "@executable_path/../Frameworks/" + libname; new_path = "@executable_path/../Frameworks/" + libname;
piCout << " depend on lib" << fl; piCout << " depend on lib" << fl;
} }
@@ -420,7 +419,7 @@ void patchNameTool() {
new_path = "@executable_path/../Frameworks/" + fname + "/" + frameworkInternalPath(sys_lib); new_path = "@executable_path/../Frameworks/" + fname + "/" + frameworkInternalPath(sys_lib);
piCout << " depend on framework" << fl; piCout << " depend on framework" << fl;
} }
if (!new_path.isEmpty()) { if (!new_path.isEmpty() && (sys_lib != new_path)) {
cmd = nametool + " -change \"" + sys_lib + "\""; cmd = nametool + " -change \"" + sys_lib + "\"";
cmd += " \"" + new_path + "\""; cmd += " \"" + new_path + "\"";
cmd += " \"" + local_lib + "\" 2> /dev/null"; cmd += " \"" + local_lib + "\" 2> /dev/null";