linux: fix static libgfortran / libstdc++ check 33/20833/1
Clément DAVID [Mon, 11 Feb 2019 16:48:10 +0000 (17:48 +0100)]
Change-Id: I9cef4b323c7bf0ee77dc40b8a285151aa22e4f98

scilab/Makefile.am
scilab/Makefile.in

index 558e735..42e0157 100644 (file)
@@ -220,7 +220,7 @@ endif
 check-libstdcpp-dep:
 if USE_STATIC_SYSTEM_LIB
 # Check that scilab-cli does not have a dependency on libstdc++ (should be static)
-       @ldd .libs/scilab-bin .libs/scilab-cli-bin modules/.libs/libscilab*0 |grep libstdc++ > /dev/null; \
+       @readelf -d .libs/scilab-bin .libs/scilab-cli-bin modules/.libs/libscilab*so* |grep libstdc++ > /dev/null; \
        if test $$? == 0; then \
                echo "Found dependency from scilab-cli-bin to libstdc++ found"; exit 2;\
        fi
index fe31034..7f3201f 100644 (file)
@@ -2160,7 +2160,7 @@ check-jvm-dep:
 
 check-libstdcpp-dep:
 # Check that scilab-cli does not have a dependency on libstdc++ (should be static)
-@USE_STATIC_SYSTEM_LIB_TRUE@   @ldd .libs/scilab-bin .libs/scilab-cli-bin modules/.libs/libscilab*0 |grep libstdc++ > /dev/null; \
+@USE_STATIC_SYSTEM_LIB_TRUE@   @readelf -d .libs/scilab-bin .libs/scilab-cli-bin modules/.libs/libscilab*so* |grep libstdc++ > /dev/null; \
 @USE_STATIC_SYSTEM_LIB_TRUE@   if test $$? == 0; then \
 @USE_STATIC_SYSTEM_LIB_TRUE@           echo "Found dependency from scilab-cli-bin to libstdc++ found"; exit 2;\
 @USE_STATIC_SYSTEM_LIB_TRUE@   fi