git-svn-id: svn://db.shs.com.ru/pip@1040 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

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<PIString> all_libs, miss_libs, all_deps, frameworks, framework_libs, miss_frameworks, qt_plugins, ignore_libs;
 PIMap<PIString, PIStringList> qt_filters;
 
@@ -346,8 +346,10 @@ void procQt() {
 					copyWildcard(qdir + plugin + "/" + f, out_plugins_dir + plugin);
 					PIVector<PIFile::FileInfo> 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);
 	}
 }