From f205d037d1a9e2be36d46c05789471a25b779af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 16 Apr 2020 16:50:07 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@1053 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- utils/deploy_tool/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp index 135edbb5..c1bb3f76 100644 --- a/utils/deploy_tool/main.cpp +++ b/utils/deploy_tool/main.cpp @@ -256,7 +256,7 @@ void procLdd(PIString file, bool ext_lib = false, int cur_depth = 0) { l.cutLeft(1).cutRight(1).trim(); if (l.isEmpty()) continue; if (!otool.isEmpty()) { - if (!l.startsWith("/usr/local/opt")) { + if (!l.startsWith("/usr/local/")) { PIFile::FileInfo fi; fi.path = l; l = fi.name(); @@ -393,7 +393,7 @@ void patchNameTool() { fi.path = local_lib; cmd = nametool + " -id \"@executable_path/../Frameworks/" + fi.name() + "\""; cmd += " \"" + local_lib + "\" 2> /dev/null"; - piCout << " " << cmd; + //piCout << " " << cmd; execute(cmd); } piForeach (PIString f, flibs) { @@ -415,7 +415,7 @@ void patchNameTool() { fi.path = sys_lib; libname = fi.name(); PIString fl = findLib(libname), fname = frameworkName(sys_lib); - piCout << " check" << sys_lib << fl; + //piCout << " check" << sys_lib << fl; PIString new_path; if (all_libs.contains(fl) || all_libs.contains(sys_lib)) { new_path = "@executable_path/../Frameworks/" + libname; @@ -431,7 +431,7 @@ void patchNameTool() { cmd = nametool + " -change \"" + sys_lib + "\""; cmd += " \"" + new_path + "\""; cmd += " \"" + local_lib + "\" 2> /dev/null"; - piCout << " " << cmd; + //piCout << " " << cmd; execute(cmd); } }