From 16b64a636c61fd7b7b412113922fbae2e1e283c2 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 14:24:06 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@1040 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- utils/deploy_tool/main.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp index f99871bd..28a70c58 100644 --- a/utils/deploy_tool/main.cpp +++ b/utils/deploy_tool/main.cpp @@ -110,7 +110,7 @@ QtDep qt_deps[] = { int depth = 5; 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; +PIStringList styles, lib_dirs, add_libs, platforms, sqldrivers, input_files, plugin_libs; PISet all_libs, miss_libs, all_deps, frameworks, framework_libs, miss_frameworks, qt_plugins, ignore_libs; PIMap qt_filters; @@ -346,8 +346,10 @@ void procQt() { copyWildcard(qdir + plugin + "/" + f, out_plugins_dir + plugin); PIVector copied = PIDir(out_plugins_dir + plugin).entries(); piForeachC (PIFile::FileInfo & fi, copied) { - if (fi.isFile()) + if (fi.isFile()) { procLdd(fi.path); + plugin_libs << fi.path; + } } } } @@ -378,6 +380,8 @@ void patchNameTool() { PIStringList dlibs; //PICout(DefaultControls) << "start patch" << clibs; PIFile::FileInfo fi; + patch_list = input_files; + patch_list << plugin_libs; piForeach (PIString l, clibs) { fi.path = l; patch_list << (out_dir + fi.name()); @@ -415,7 +419,7 @@ void patchNameTool() { if (!new_path.isEmpty() && (sys_lib != new_path)) { cmd = nametool + " -change \"" + sys_lib + "\""; cmd += " \"" + new_path + "\""; - cmd += " \"" + local_lib + "\""; + cmd += " \"" + local_lib + "\" 2> /dev/null"; //piCout << " " << cmd; execute(cmd); } @@ -423,7 +427,7 @@ void patchNameTool() { } piForeach (PIString bin, input_files) { cmd = nametool + " -add_rpath \"@executable_path/../Frameworks\""; - cmd += " \"" + bin + "\""; + cmd += " \"" + bin + "\" 2> /dev/null"; execute(cmd); } }