diff options
author | Patrick Venture <venture@google.com> | 2018-11-13 13:08:03 -0800 |
---|---|---|
committer | Patrick Venture <venture@google.com> | 2018-11-13 23:46:35 +0000 |
commit | 1d5cccb5837f210d8156811e87cdb111c2037d80 (patch) | |
tree | 18bd9be796d4eeb025b6a7bf391cf01e3c1af065 | |
parent | ebf7b9b60cb57913ac20b669203cd9192b660b7e (diff) | |
download | phosphor-ipmi-blobs-1d5cccb5837f210d8156811e87cdb111c2037d80.tar.gz phosphor-ipmi-blobs-1d5cccb5837f210d8156811e87cdb111c2037d80.zip |
bugfix: flip library search logic
Fix library search logic to load libraries installed of the format:
libname.so.? versus libname.so because the recipe creates a symlink of
the form libname.so.? only.
Tested: Now it finds and loads the handlers.
Change-Id: Ie7280f41a678bf78db226bb458c02396e352da56
Signed-off-by: Patrick Venture <venture@google.com>
-rw-r--r-- | utils.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -20,7 +20,12 @@ void loadLibraries(const std::string& path) { auto ps = p.path().string(); - if (!std::regex_match(ps, std::regex(".+\\.so$"))) + /* The bitbake recipe symlinks the library lib*.so.? into the folder + * only, and not the other names, .so, .so.?.?, .so.?.?.? + * + * Therefore only care if it's lib*.so.? + */ + if (!std::regex_match(ps, std::regex(".+\\.so\\.\\d+$"))) { continue; } |