Skip to content

add a fallback that loads the mdapi library with an explicit soversion #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 21, 2024
Merged

add a fallback that loads the mdapi library with an explicit soversion #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cliloader/printmetrics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ static void* OpenLibrary()
{
void* ret = dlopen(cMDLibFileName, RTLD_LAZY | RTLD_LOCAL);
#if !defined(__APPLE__)
if (ret == NULL)
{
// try adding an explicit soversion
std::string check(cMDLibFileName); check += ".1";
ret = dlopen(check.c_str(), RTLD_LAZY | RTLD_LOCAL);
}
if (ret == NULL)
{
// old alternate name, may eventually be removed
Expand Down
6 changes: 6 additions & 0 deletions intercept/mdapi/MetricsDiscoveryHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ static void* OpenLibrary( const std::string& metricsLibraryName )
ret = dlopen(cMDLibFileName, RTLD_LAZY | RTLD_LOCAL);
}
#if !defined(__APPLE__)
if (ret == NULL)
{
// try adding an explicit soversion
std::string check(cMDLibFileName); check += ".1";
ret = dlopen(check.c_str(), RTLD_LAZY | RTLD_LOCAL);
}
if( ret == NULL )
{
// old alternate name, may eventually be removed
Expand Down