Skip to content

Commit

Permalink
INFC-268 fix solaris build
Browse files Browse the repository at this point in the history
Changed `"xargs -n 1 ldd"` for `health_check_solaris` in
`lib/omnibus/health_check.rb` to allow regex for
`current_library` to be found.

Updated whitelist for `bad_libs` dependencies

Signed-off-by: Thomas Powell <powell@progress.com>
  • Loading branch information
tpowell-progress committed Oct 6, 2022
1 parent 4b6901c commit 28da485
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions lib/omnibus/health_check.rb
Original file line number Diff line number Diff line change
Expand Up @@ -345,11 +345,10 @@ def health_check_solaris
bad_libs = {}
good_libs = {}

read_shared_libs("find #{project.install_dir}/ -type f | xargs file | grep \"ELF\" | awk -F: '{print $1}' | sed -e 's/:$//'", "xargs -n 1 ldd") do |line|
read_shared_libs("find #{project.install_dir}/ -type f | xargs file | grep \"ELF\" | awk -F: '{print $1}' | sed -e 's/:$//'", "xargs ldd") do |line|
case line
when /^(.+):$/
current_library = Regexp.last_match[1]
log.debug(log_key) { "Analyzing dependencies for #{current_library}" }
when /^\s+(.+) \=\>\s+(.+)( \(.+\))?$/
name = Regexp.last_match[1]
linked = Regexp.last_match[2]
Expand Down

0 comments on commit 28da485

Please sign in to comment.