Changeset ac1aba4b

Timestamp:

Jun 6, 2022, 5:18:47 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

86c12d65, c8f5f7d

Parents:

f11296a

Message:

Tentative change to fix jenkins setup script when RUNPATH is not found and ldd does find libcfa

File:

• tools/jenkins/setup.sh.in (modified) (2 diffs)

tools/jenkins/setup.sh.in

@@ -29 +29 @@
 function getrunpath()
 {
-        local elfout=$(readelf -d $1 | grep "RUNPATH")
+        local elfout=$(readelf -d $1 | grep -E "RPATH|RUNPATH")
         regex='\[/([[:alpha:][:digit:]@/_.-]+)\]'
         if [[ $elfout =~ $regex ]]; then
@@ -43 +43 @@
 {
         local deps=$(ldd $1)
+        retlcldeps=()
         retsysdeps=()
-        retlcldeps=()
         while IFS= read -r line; do
-                regex1='/([[:alpha:][:digit:]@/_.-]+)'
-                regex2='(libcfa[[:alpha:][:digit:].]+) => not found'
+                regex1='(libcfa[[:alpha:][:digit:].]+)'
+                regex2='/([[:alpha:][:digit:]@/_.-]+)'
                 regex3='linux-vdso.so.1|linux-gate.so.1'
                 if [[ $line =~ $regex1 ]]; then
+                        retlcldeps+=(${BASH_REMATCH[1]})
+                elif [[ $line =~ $regex2 ]]; then
                         retsysdeps+=(${BASH_REMATCH[1]})
-                elif [[ $line =~ $regex2 ]]; then
-                        retlcldeps+=(${BASH_REMATCH[1]})
                 elif [[ $line =~ $regex3 ]]; then
                         # echo "ignoring '$line}': intrinsic"