status-im
/
macdylibbundler
mirror of https://github.com/status-im/macdylibbundler.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

revert 'handle @executable_path run-path dependent libraries (a5ac81c)

This commit is contained in:
SCG82 2020-01-10 04:18:01 -08:00
parent 701dd6b7f8
commit e3e1dc7a2f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/DylibBundler.cpp
View File

@ -146,9 +146,7 @@ void fixRpathsOnFile(const std::string& original_file, const std::string& file_t
rpaths_to_fix = Settings::getRpathsForFile(original_file); rpaths_to_fix = Settings::getRpathsForFile(original_file);
for (const auto& rpath_to_fix : rpaths_to_fix) { for (const auto& rpath_to_fix : rpaths_to_fix) {
std::string command = std::string("install_name_tool -rpath "); std::string command = std::string("install_name_tool -rpath ") + rpath_to_fix + " " + Settings::insideLibPath() + " " + file_to_fix;
command.append(rpath_to_fix).append(" ").append(Settings::insideLibPath());
command.append(" ").append(file_to_fix);
if (systemp(command) != 0) { if (systemp(command) != 0) {
std::cerr << "\n\n/!\\ ERROR: An error occured while trying to fix rpath " << rpath_to_fix << " of " << file_to_fix << std::endl; std::cerr << "\n\n/!\\ ERROR: An error occured while trying to fix rpath " << rpath_to_fix << " of " << file_to_fix << std::endl;
exit(1); exit(1);

4
src/Settings.cpp
View File

@ -115,8 +115,8 @@ bool isPrefixBundled(const std::string& prefix)
{ {
if (!bundle_frameworks && prefix.find(".framework") != std::string::npos) if (!bundle_frameworks && prefix.find(".framework") != std::string::npos)
return false; return false;
// if (prefix.find("@executable_path") != std::string::npos) if (prefix.find("@executable_path") != std::string::npos)
// return false; return false;
if (prefix.find("/usr/lib/") == 0) if (prefix.find("/usr/lib/") == 0)
return false; return false;
if (prefix.find("/System/Library/") != std::string::npos) if (prefix.find("/System/Library/") != std::string::npos)

6
src/Utils.cpp
View File

@ -141,9 +141,11 @@ bool fileExists(const std::string& filename)
bool isRpath(const std::string& path) bool isRpath(const std::string& path)
{ {
// return path.find("@rpath") != std::string::npos
// || path.find("@loader_path") != std::string::npos
// || path.find("@executable_path") != std::string::npos;
return path.find("@rpath") != std::string::npos return path.find("@rpath") != std::string::npos
|| path.find("@loader_path") != std::string::npos || path.find("@loader_path") != std::string::npos;
|| path.find("@executable_path") != std::string::npos;
} }
std::string bundleExecutableName(const std::string& app_bundle_path) std::string bundleExecutableName(const std::string& app_bundle_path)