Re: FYI: HEAD: new export.at test

[Ralf Wildenhues]

> * Bob Friesenhahn wrote on Sun, Feb 11, 2007 at 07:34:25PM CET:
> > On Sun, 11 Feb 2007, Ralf Wildenhues wrote:
> > >
> > >This patch makes the cmdline_wrap test pass on GNU/Linux and newer
> > >Solaris.  Showing 'diff -b', hiding the indentation of the large
> > >block inside `if $have_libobjs'.
> > 
> > Provided that this patch does not increase the test error count prior 
> > to test #49, I am happy with it. :-)

Well, the previous version did regress on other systems.
This should not.  I've applied it now (so we find out ;-)

Attached is the real diff, and inline the diff -b for readability.

Cheers,
Ralf

2007-02-23  Ralf Wildenhues  <address@hidden>

        Fix -export-symbols and -export-symbols-regex for links that
        exceed the command line length and use convenience archives.

        * libltdl/config/ltmain.m4sh (func_mode_link): Avoid grepping a
        nonexistent file if using reloadable objects.  Do not create a
        linker script nor a linker input file if no objects are passed.
        Apply export_symbols_regex in case the command line length is
        exceeded.
        Report by Bob Friesenhahn.

Index: libltdl/config/ltmain.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/config/ltmain.m4sh,v
retrieving revision 1.67
diff -u -b -r1.67 ltmain.m4sh
--- libltdl/config/ltmain.m4sh  23 Feb 2007 21:11:25 -0000      1.67
+++ libltdl/config/ltmain.m4sh  23 Feb 2007 21:40:00 -0000
@@ -5143,7 +5143,7 @@
              fi
            done
            IFS="$save_ifs"
-           if test -n "$export_symbols_regex"; then
+           if test -n "$export_symbols_regex" && test "X$skipped_export" != 
"X:"; then
              func_show_eval '$EGREP -e "$export_symbols_regex" 
"$export_symbols" > "${export_symbols}T"'
              func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
            fi
@@ -5263,7 +5263,7 @@
          last_robj=
          k=1
 
-         if test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+         if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test 
"$with_gnu_ld" = yes; then
            output=${output_objdir}/${output_la}.lnkscript
            func_echo "creating GNU ld script: $output"
            $ECHO 'INPUT (' > $output
@@ -5273,7 +5273,7 @@
            done
            $ECHO ')' >> $output
            delfiles="$delfiles $output"
-         elif test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; 
then
+         elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && 
test "X$file_list_spec" != X; then
            output=${output_objdir}/${output_la}.lnk
            func_echo "creating linker input file list: $output"
            : > $output
@@ -5291,6 +5291,7 @@
            delfiles="$delfiles $output"
            output=$firstobj\"$file_list_spec$output\"
          else
+           if test -n "$save_libobjs"; then
            func_echo "creating reloadable object files..."
            output=$output_objdir/$output_la-${k}.$objext
            # Loop over the list of objects to be linked.
@@ -5325,15 +5326,6 @@
            test -z "$concat_cmds" || concat_cmds=$concat_cmds~
            eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
 
-           if ${skipped_export-false}; then
-             func_echo "generating symbol list for \`$libname.la'"
-             export_symbols="$output_objdir/$libname.exp"
-             $opt_dry_run || $RM $export_symbols
-             libobjs=$output
-             # Append the command to create the export file.
-             eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-           fi
-
            # Set up a command to remove the reloadable object files
            # after they are used.
            i=0
@@ -5342,7 +5334,21 @@
              i=`expr $i + 1`
              delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
            done
+           else
+             output=
+           fi
 
+           if ${skipped_export-false}; then
+             func_echo "generating symbol list for \`$libname.la'"
+             export_symbols="$output_objdir/$libname.exp"
+             $opt_dry_run || $RM $export_symbols
+             libobjs=$output
+             # Append the command to create the export file.
+             test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+             eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+           fi
+
+           test -n "$save_libobjs" &&
            func_echo "creating a temporary reloadable object file: $output"
 
            # Loop through the commands generated above and execute them.
@@ -5367,6 +5373,11 @@
              }
            done
            IFS="$save_ifs"
+
+           if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+             func_show_eval '$EGREP -e "$export_symbols_regex" 
"$export_symbols" > "${export_symbols}T"'
+             func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+           fi
          fi
 
          libobjs=$output

export-sym.diff
Description: Text Data