From f5d6ad1854045854f7a01b69e49af7ef40325ac8 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: Sat, 18 Apr 2020 13:59:21 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@1057 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 e8460304..c30c6eea 100644 --- a/utils/deploy_tool/main.cpp +++ b/utils/deploy_tool/main.cpp @@ -64,7 +64,7 @@ void usage() { piCout << "-M " << Green << "- \"otool\" path, overrides \"ldd\""; piCout << "-D " << Green << "- \"dpkg\" path, default \"/usr/bin/dpkg\""; piCout << "--name-tool " << Green << "- \"install_name_tool\" path, default \"install_name_tool\""; - piCout << "-d " << Green << "- maximum dependepcies depth, default 5"; + piCout << "-d " << Green << "- maximum dependepcies depth, default 8"; //piCout << "-Q, --Qt-force " << Green << "- force add Qt root dir, default takes from \"qmake -v\""; piCout << ""; piCout << Bold << "Qt control"; @@ -107,7 +107,7 @@ QtDep qt_deps[] = { }; -int depth = 5; +int depth = 8; bool fake = false, is_ldd = true, is_deps = false, need_qt = false; PIString ldd, readelf, objdump, otool, dpkg, nametool, out_dir, qt_dir, out_plugins_dir; PIStringList styles, lib_dirs, add_libs, platforms, sqldrivers, input_files, plugin_libs; @@ -419,7 +419,7 @@ void patchNameTool() { PIString new_path; if (all_libs.contains(fl) || all_libs.contains(sys_lib)) { new_path = "@executable_path/../Frameworks/" + libname; - piCout << " depend on lib" << fl; + piCout << " depend on lib" << (fl.isEmpty() ? sys_lib : fl); } else { if (frameworks.contains(fname)) { fl = findLib(fname); @@ -432,7 +432,7 @@ void patchNameTool() { cmd = nametool + " -change \"" + sys_lib + "\""; cmd += " \"" + new_path + "\""; cmd += " \"" + local_lib + "\" 2> /dev/null"; - piCout << " *" << cmd; + //piCout << " *" << cmd; execute(cmd); } }