* bug 7887 fixed - Under some GNU/Linux distributions (like Ubuntu or Mageia),5.3.2

                   the dynamic link process was using the libstdc++ embedded
                   into the Scilab distribution. Now, if the compiler is gcc,
                   the dynamic link guesses the libstdc++ path and use it
                   uppermost.

Change-Id: I74b0563f5a71bce668f250b15f82882594bd1bb9

5 files changed, 43 insertions, 4 deletions

diff --git a/scilab/modules/dynamic_link/help/en_US/ilib_build.xml b/scilab/modules/dynamic_link/help/en_US/ilib_build.xml
index 76c7873..3547f16 100644
--- a/scilab/modules/dynamic_link/help/en_US/ilib_build.xml
+++ b/scilab/modules/dynamic_link/help/en_US/ilib_build.xml
@@ -127,6 +127,11 @@
 
     <para><emphasis role="bold">Languages handle by this function are: C, C++,
     Fortran and Fortran 90.</emphasis></para>
+
+    <para>On the internal technical level, under GNU/Linux and Mac OS X, the ilib_* function are based on the autotools. First, a configure is executed to detect compilers available. Then, a make is launched with the provided arguments. For more information: <ulink url="http://wiki.scilab.org/Full%20technical%20description%20of%20the%20incremental%20link">Full technical description of the incremental link / dynamic link</ulink></para>
+
+    <para>Since version 5.3.2, under GNU/Linux, Scilab detects where the libstdc++ is located (thanks to the command <emphasis role="italic">gcc -print-search-dirs|grep ^install:|awk '{print $2}'</emphasis>). Previously, the dynamic link was using the libstdc++ embedded in Scilab.</para>
+
   </refsection>
 
   <refsection>
diff --git a/scilab/modules/dynamic_link/help/en_US/ilib_compile.xml b/scilab/modules/dynamic_link/help/en_US/ilib_compile.xml
index 5c419ce..cf2c3bc 100644
--- a/scilab/modules/dynamic_link/help/en_US/ilib_compile.xml
+++ b/scilab/modules/dynamic_link/help/en_US/ilib_compile.xml
@@ -69,6 +69,11 @@
     Shared libraries can then be used with the <literal>link</literal> and
     <literal>addinter</literal> Scilab function for incremental/dynamic link.</para>
         <para><emphasis role="bold">Note that a compiler must be available on the system to use this function.</emphasis></para>
+
+    <para>On the internal technical level, under GNU/Linux and Mac OS X, the ilib_* function are based on the autotools. First, a configure is executed to detect compilers available. Then, a make is launched with the provided arguments. For more information: <ulink url="http://wiki.scilab.org/Full%20technical%20description%20of%20the%20incremental%20link">Full technical description of the incremental link / dynamic link</ulink></para>
+
+    <para>Since version 5.3.2, under GNU/Linux, Scilab detects where the libstdc++ is located (thanks to the command <emphasis role="italic">gcc -print-search-dirs|grep ^install:|awk '{print $2}'</emphasis>). Previously, the dynamic link was using the libstdc++ embedded in Scilab.</para>
+
   </refsection>
   <refsection role="see also">
 <title>See Also</title>
diff --git a/scilab/modules/dynamic_link/help/en_US/ilib_for_link.xml b/scilab/modules/dynamic_link/help/en_US/ilib_for_link.xml
index 5b708c0..d0ae845 100644
--- a/scilab/modules/dynamic_link/help/en_US/ilib_for_link.xml
+++ b/scilab/modules/dynamic_link/help/en_US/ilib_for_link.xml
@@ -126,6 +126,11 @@
     directory. They are all released into the public domain.</para>
         <para><emphasis role="bold">Note that a compiler must be available on the system to use this function.</emphasis></para>
         <para><emphasis role="bold">Languages handle by this function are: C, C++, Fortran and Fortran 90.</emphasis></para>
+
+    <para>On the internal technical level, under GNU/Linux and Mac OS X, the ilib_* function are based on the autotools. First, a configure is executed to detect compilers available. Then, a make is launched with the provided arguments. For more information: <ulink url="http://wiki.scilab.org/Full%20technical%20description%20of%20the%20incremental%20link">Full technical description of the incremental link / dynamic link</ulink></para>
+
+    <para>Since version 5.3.2, under GNU/Linux, Scilab detects where the libstdc++ is located (thanks to the command <emphasis role="italic">gcc -print-search-dirs|grep ^install:|awk '{print $2}'</emphasis>). Previously, the dynamic link was using the libstdc++ embedded in Scilab.</para>
+
   </refsection>
   <refsection>
     <title>Examples (C code)</title>
diff --git a/scilab/modules/dynamic_link/macros/ilib_compile.sci b/scilab/modules/dynamic_link/macros/ilib_compile.sci
index 604b29b..ebd0fcf 100644
--- a/scilab/modules/dynamic_link/macros/ilib_compile.sci
+++ b/scilab/modules/dynamic_link/macros/ilib_compile.sci
@@ -144,6 +144,17 @@ function libn = ilib_compile(lib_name, ..
     // Switch back to the TMPDIR where the mandatory files are
 
     chdir(TMPDIR+"/"+lib_name_orig);
+
+   // Detect the actual path to the libstdc++ library. For the dynamic link
+   // build, we want to use the same lib as the compiler installed.
+   // CF bug #7887 for more information.
+   // Note that, for the configure, the setup is done by compilerDetection.sh
+    cmdGCC="if test -x ""$(which gcc 2>/dev/null)""; then echo $(LC_ALL=C gcc -print-search-dirs|awk ''$1==""install:""{print $2}''); fi";
+    [GCClibpath, ierr, stderr] = unix_g(cmdGCC);
+    if (GCClibpath <> "" & ierr == 0 & grep(getenv("LD_LIBRARY_PATH"),GCClibpath) == []) then
+        setenv("LD_LIBRARY_PATH",GCClibpath+"/../../../:"+getenv("LD_LIBRARY_PATH"));
+    end
+
     cmd = "make "
 
     cmd = cmd + gencompilationflags_unix(ldflags, cflags, fflags, cc, "build")
diff --git a/scilab/modules/dynamic_link/src/scripts/compilerDetection.sh b/scilab/modules/dynamic_link/src/scripts/compilerDetection.sh
index cba21c5..03dcba7 100755
--- a/scilab/modules/dynamic_link/src/scripts/compilerDetection.sh
+++ b/scilab/modules/dynamic_link/src/scripts/compilerDetection.sh
@@ -3,12 +3,25 @@
 PROGNAME="$0"
 PATHTOCONFIGURE=`dirname "$PROGNAME"`
 cd $PATHTOCONFIGURE
+if test -x "$(which gcc 2>/dev/null)"; then
+    # Detect the actual path to the libstdc++ library. For the dynamic link
+    # build, we want to use the same lib as the compiler installed.
+    # CF bug #7887 for more information.
+    # Note that, for the Makefile, the setup is done in the Scilab macros
+    # ilib_compile
+    GCClibpath=$(LC_ALL=C gcc -print-search-dirs|awk '$1=="install:"{print $2}')/../../../
+
+    if test -z "$(grep $GCClibpath $LD_LIBRARY_PATH 2>/dev/null)"; then
+        LD_LIBRARY_PATH="$GCClibpath${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+        export LD_LIBRARY_PATH
+    fi
+fi
 
 # Relaunch configure if files are missing
 if test ! -s Makefile.orig -o ! -s libtool; then 
-        echo "Detection of C/C++/Fortran Compilers"
-        ./configure --disable-static --disable-dependency-tracking "$@"
-        mv Makefile Makefile.orig
+    echo "Detection of C/C++/Fortran Compilers"
+    ./configure --disable-static --disable-dependency-tracking "$@"
+    mv Makefile Makefile.orig
 else 
-        echo "Detection of compilers already done"
+    echo "Detection of compilers already done"
 fi