DAOS-16814 build: Add tighter checking to patchelf failures. (#15522)

Check patchelf return codes more strictly, only accept
failure for the ond file that fails and only accept one
return code.

This means that any other failure of patchelf will correctly cause
a build failure.

Signed-off-by: Ashley Pittman <[email protected]>

site_scons/prereq_tools/base.py

@@ -172,6 +172,18 @@ def __str__(self):
         return f'{self.component} needs to be built, use --build-deps=yes'
 
 
+class RunnerResult():
+    """Helper class for Runner that allows returning extra values without changing the API"""
+
+    # pylint: disable=too-few-public-methods
+    def __init__(self, rc):
+        self.rc = rc
+
+    def __bool__(self):
+        """Add a truth function"""
+        return self.rc == 0
+
+
 class Runner():
     """Runs commands in a specified environment"""
 
@@ -185,10 +197,13 @@ def initialize(self, env):
         self.__dry_run = env.GetOption('no_exec')
 
     def run_commands(self, commands, subdir=None, env=None):
-        """Runs a set of commands in specified directory"""
+        """Runs a set of commands in specified directory
+
+        Returns a RunnerResult object that resolves to True on process failure.
+        """
         # Check that PreReqComponent is initialized
         assert self.env
-        retval = True
+        retval = RunnerResult(0)
 
         passed_env = env or self.env
 
@@ -203,11 +218,11 @@ def run_commands(self, commands, subdir=None, env=None):
                     cmd.append(self.env.subst(part))
             if self.__dry_run:
                 print(f"Would RUN: {' '.join(cmd)}")
-                retval = True
             else:
                 print(f"RUN: {' '.join(cmd)}")
-                if subprocess.call(cmd, shell=False, cwd=subdir, env=passed_env['ENV']) != 0:
-                    retval = False
+                rc = subprocess.call(cmd, shell=False, cwd=subdir, env=passed_env['ENV'])
+                if rc != 0:
+                    retval = RunnerResult(rc)
                     break
         return retval
 
@@ -1417,8 +1432,12 @@ def _patch_rpaths(self):
                     continue
                 full_lib = os.path.join(path, lib)
                 cmd = ['patchelf', '--set-rpath', ':'.join(rpath), full_lib]
-                if not RUNNER.run_commands([cmd]):
-                    print(f'Skipped patching {full_lib}')
+                res = RUNNER.run_commands([cmd])
+                if not res:
+                    if lib == 'libspdk.so' and res.rc == 1:
+                        print(f'Skipped patching {full_lib}')
+                    else:
+                        raise BuildFailure(f'Error running patchelf on {full_lib} ({res.rc})')
 
     def build(self, env, needed_libs):
         """Build the component, if necessary