audacity/linuxdeploy
1
0
Fork 0
mirror of https://github.com/audacity/linuxdeploy.git synced 2026-04-16 21:51:43 -05:00
Code Issues Packages Projects Releases 1 Wiki Activity

Calculate relative path from absolute paths

Browse Source 
Seems to work without any kind of workarounds.
This commit is contained in:
TheAssassin
2018-06-08 11:36:18 +02:00
parent 720dd68d56
commit fa2b463363
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/appdir.cpp
View File

@@ -243,8 +243,9 @@ namespace linuxdeploy {
} else {
rpathDestination = destination.parent_path().string();
}
// FIXME: adding / to "fake" root to calculate proper relative path
rpath = "$ORIGIN/" + bf::relative("/usr/lib", "/" + rpathDestination).string() + ":$ORIGIN";
auto relPath = bf::relative(bf::absolute(appDirPath) / "usr/lib", bf::absolute(rpathDestination));
rpath = "$ORIGIN/" + relPath.string() + ":$ORIGIN";
}
setElfRPathOperations[destinationPath / path.filename()] = rpath;