Changeset 111 in flair-dev

Timestamp:

Feb 4, 2020, 3:55:19 PM (5 years ago)

Author:

Sanahuja Guillaume

Message:

up for libgl

File:

• tags/latest/scripts/distribution_specific_hack.sh (modified) (2 diffs)

tags/latest/scripts/distribution_specific_hack.sh

@@ +1 @@
+#check required version of a lib in host graphic lib (ie i965)
+#return 1 if robomap3 version is not sufficient
+function check_required_lib_ver () {
+    DRIVER_LIB=$1       
+    PATTERN=$2
+    LIB=$3
+
+    #get the highest required version of $PATTERN
+    VER_REQUIRED=$(objdump -T $DRIVER_LIB | grep $PATTERN | sed -e 's/.*'$PATTERN'_\(.*\) .*/\1/' | sort -uV | tail -1)
+    #get currently used $LIB
+    LIB_PROVIDED=$(ldd $EXEC | grep $LIB | sed -e 's/.*=> \(.*\) (.*/\1/')
+    #get the highest version of $PATTERN supported by the $LIB
+    VER_PROVIDED=$(objdump -T $LIB_PROVIDED | grep ".*"$PATTERN"_[0-9.]*$" | sed -e 's/.*'$PATTERN'_\(.*\)/\1/' | sort -V | tail -1)
+    if [ $(echo -e "$VER_PROVIDED\n$VER_REQUIRED" | sort -V | tail -n1) != $VER_PROVIDED ]; then
+        echo "We must use the local system $LIB"
+        return 1
+    fi
+}
+
 if [ -f /etc/lsb-release ]; then
   . /etc/lsb-release
@@ -15 +34 @@
   fi
 
-  #special actions if we use 3D
-  ldd $EXEC | grep "libGL.so" > /dev/null
-  if [ $? -eq 0 ]; then
+fi
+
+#special actions if we use 3D
+ldd $EXEC | grep "libGL.so" > /dev/null
+if [ $? -eq 0 ]; then
     #allow root access to the X server
     xhost si:localuser:root
 
-    #Mesa DRI driver may need a libstdc++ more recent than robomap3's
+    #Mesa DRI driver may need a lib more recent than robomap3's
     ldconfig -p | grep mesa > /dev/null
     if [ $? -eq 0 ]; then
-      read DRI_CARD_MAJOR DRI_CARD_MINOR < <(stat -c '%t %T' /dev/dri/card0)
-      DRIVER=$(cat /sys/dev/char/$((16#$DRI_CARD_MAJOR)):$((16#$DRI_CARD_MINOR))/device/uevent | grep DRIVER | cut -d= -f2)
-      echo "Mesa DRI driver is $DRIVER"
-          DRIVER_LIB=$(LIBGL_DEBUG=verbose glxinfo 2>&1 | grep "\.so" | tail -n 1 | grep -o '/.*\.so')
-      #get the highest required version of CXXABI
-      CXXABI_REQUIRED=$(objdump -T $DRIVER_LIB | grep CXXABI | sed -e 's/.*CXXABI_\(.*\) .*/\1/' | sort -uV | tail -1)
-      #get currently used libstdc++
-      LIBSTDCXX_PROVIDED=$(ldd $EXEC | grep libstdc++ | sed -e 's/.*=> \(.*\) (.*/\1/')
-      #get the highest version of CXXABI supported by the libstdc++
-      CXXABI_PROVIDED=$(objdump -T $LIBSTDCXX_PROVIDED | grep ".*CXXABI_[0-9.]*$" | sed -e 's/.*CXXABI_\(.*\)/\1/' | sort -V | tail -1)
-      if [ $(echo -e "$CXXABI_PROVIDED\n$CXXABI_REQUIRED" | sort -V | tail -n1) != $CXXABI_PROVIDED ]; then
-        echo "We must use the local system libstdc++"
-        export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libstdc++.so.6
-      fi
+        read DRI_CARD_MAJOR DRI_CARD_MINOR < <(stat -c '%t %T' /dev/dri/card0)
+        DRIVER=$(cat /sys/dev/char/$((16#$DRI_CARD_MAJOR)):$((16#$DRI_CARD_MINOR))/device/uevent | grep DRIVER | cut -d= -f2)
+        echo "Mesa DRI driver is $DRIVER"
+        DRIVER_LIB=$(LIBGL_DEBUG=verbose glxinfo 2>&1 | grep "\.so" | tail -n 1 | grep -o '/.*\.so')
+
+        #todo: make a list, find a complete one!
+        check_required_lib_ver $DRIVER_LIB GLIBC libm.so.6
+        if [ "$?" = "1" ]; then
+                   ADDED_LIBS=$(ldconfig -p | grep libm.so.6 | grep libc6,x86-64 | cut -d'>' -f2)
+            fi
+
+        check_required_lib_ver $DRIVER_LIB CXXABI libstdc++.so.6
+        if [ "$?" = "1" ]; then
+                   ADDED_LIBS="$ADDED_LIBS:$(ldconfig -p | grep libstdc++.so.6 | grep libc6,x86-64 | cut -d'>' -f2)"
+            fi
+        #remove whitespace
+        #add libs to LD_PRELOAD if version robomap3 version is not sufficient
+        export LD_PRELOAD="$(echo -e "${ADDED_LIBS}" | tr -d '[:space:]')"
     fi
-  fi
 fi
 
+
+