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

Browse Source
This commit is contained in:
Пелипенко Иван
2020-04-16 16:50:07 +00:00
parent 8cb7e25d20
commit f205d037d1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/deploy_tool/main.cpp
View File

@@ -256,7 +256,7 @@ void procLdd(PIString file, bool ext_lib = false, int cur_depth = 0) {
l.cutLeft(1).cutRight(1).trim(); l.cutLeft(1).cutRight(1).trim();
if (l.isEmpty()) continue; if (l.isEmpty()) continue;
if (!otool.isEmpty()) { if (!otool.isEmpty()) {
if (!l.startsWith("/usr/local/opt")) { if (!l.startsWith("/usr/local/")) {
PIFile::FileInfo fi; PIFile::FileInfo fi;
fi.path = l; fi.path = l;
l = fi.name(); l = fi.name();
@@ -393,7 +393,7 @@ void patchNameTool() {
fi.path = local_lib; fi.path = local_lib;
cmd = nametool + " -id \"@executable_path/../Frameworks/" + fi.name() + "\""; cmd = nametool + " -id \"@executable_path/../Frameworks/" + fi.name() + "\"";
cmd += " \"" + local_lib + "\" 2> /dev/null"; cmd += " \"" + local_lib + "\" 2> /dev/null";
piCout << " " << cmd; //piCout << " " << cmd;
execute(cmd); execute(cmd);
} }
piForeach (PIString f, flibs) { piForeach (PIString f, flibs) {
@@ -415,7 +415,7 @@ void patchNameTool() {
fi.path = sys_lib; fi.path = sys_lib;
libname = fi.name(); libname = fi.name();
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) || all_libs.contains(sys_lib)) { if (all_libs.contains(fl) || all_libs.contains(sys_lib)) {
new_path = "@executable_path/../Frameworks/" + libname; new_path = "@executable_path/../Frameworks/" + libname;
@@ -431,7 +431,7 @@ void patchNameTool() {
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";
piCout << " " << cmd; //piCout << " " << cmd;
execute(cmd); execute(cmd);
} }
} }