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

Avoid random methods in namespace

Browse Source
This commit is contained in:
TheAssassin
2018-06-28 02:35:23 +02:00
parent b2e2ac9a0f
commit 4c926ee2d8
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/core/elf.cpp
View File

@@ -23,6 +23,23 @@ namespace linuxdeploy {
public:
explicit PrivateData(const bf::path& path) : path(path) {}
public:
static std::string getPatchelfPath() {
// by default, try to use a patchelf next to the linuxdeploy binary
// if that isn't available, fall back to searching for patchelf in the PATH
std::string patchelfPath = "patchelf";
auto binDirPath = bf::path(util::getOwnExecutablePath());
auto localPatchelfPath = binDirPath.parent_path() / "patchelf";
if (bf::exists(localPatchelfPath))
patchelfPath = localPatchelfPath.string();
ldLog() << LD_DEBUG << "Using patchelf:" << patchelfPath << std::endl;
return patchelfPath;
}
};
ElfFile::ElfFile(const boost::filesystem::path& path) {
@@ -89,26 +106,10 @@ namespace linuxdeploy {
return paths;
}
std::string getPatchelfPath() {
// by default, try to use a patchelf next to the linuxdeploy binary
// if that isn't available, fall back to searching for patchelf in the PATH
std::string patchelfPath = "patchelf";
auto binDirPath = bf::path(util::getOwnExecutablePath());
auto localPatchelfPath = binDirPath.parent_path() / "patchelf";
if (bf::exists(localPatchelfPath))
patchelfPath = localPatchelfPath.string();
ldLog() << LD_DEBUG << "Using patchelf:" << patchelfPath << std::endl;
return patchelfPath;
}
std::string ElfFile::getRPath() {
try {
subprocess::Popen patchelfProc(
{getPatchelfPath().c_str(), "--print-rpath", d->path.c_str()},
{d->getPatchelfPath().c_str(), "--print-rpath", d->path.c_str()},
subprocess::output(subprocess::PIPE),
subprocess::error(subprocess::PIPE)
);
@@ -143,7 +144,7 @@ namespace linuxdeploy {
bool ElfFile::setRPath(const std::string& value) {
try {
subprocess::Popen patchelfProc(
{getPatchelfPath().c_str(), "--set-rpath", value.c_str(), d->path.c_str()},
{d->getPatchelfPath().c_str(), "--set-rpath", value.c_str(), d->path.c_str()},
subprocess::output(subprocess::PIPE),
subprocess::error(subprocess::PIPE)
);