[PATCH 09/10] libtool: support -export-symbols and -export-symbols-regex on OS/2

[KO Myung-Hun]

With splitting very long archive_cmds into multi-lines.

* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG):
Set archive_expsym_cmds.
---
 m4/libtool.m4 |   63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index e360efd..b0414be 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -4983,7 +4983,26 @@ _LT_EOF
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       shrext_cmds=".dll"
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} 
INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION 
\"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> 
$output_objdir/$libname.def~$ECHO "  MULTIPLE NONSHARED" >> 
$output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp 
$libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~$CC -Zdll 
-Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags 
$output_objdir/$libname.def~emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} 
INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+       $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+       $ECHO DATA >> $output_objdir/$libname.def~
+       $ECHO "  MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+       $ECHO EXPORTS >> $output_objdir/$libname.def~
+       emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> 
$output_objdir/$libname.def~
+       $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs 
$compiler_flags $output_objdir/$libname.def~
+       emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY 
${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+       $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+       $ECHO DATA >> $output_objdir/$libname.def~
+       $ECHO "  MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+       $ECHO EXPORTS >> $output_objdir/$libname.def~
+       if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+         cat $export_symbols | $SED -e 1d -e "s/^\(.*\)$/_\1/g" >> 
$output_objdir/$libname.def;
+       else
+         cat $export_symbols | $SED -e "s/^\(.*\)$/_\1/g" >> 
$output_objdir/$libname.def;
+       fi~
+       $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs 
$compiler_flags $output_objdir/$libname.def~
+       emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o 
$output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
@@ -5607,7 +5626,26 @@ _LT_EOF
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       shrext_cmds=".dll"
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} 
INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION 
\"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> 
$output_objdir/$libname.def~$ECHO "  MULTIPLE NONSHARED" >> 
$output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp 
$libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~$CC -Zdll 
-Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags 
$output_objdir/$libname.def~emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} 
INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+       $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+       $ECHO DATA >> $output_objdir/$libname.def~
+       $ECHO "  MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+       $ECHO EXPORTS >> $output_objdir/$libname.def~
+       emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> 
$output_objdir/$libname.def~
+       $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs 
$compiler_flags $output_objdir/$libname.def~
+       emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY 
${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+       $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+       $ECHO DATA >> $output_objdir/$libname.def~
+       $ECHO "  MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+       $ECHO EXPORTS >> $output_objdir/$libname.def~
+       if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+         cat $export_symbols | $SED -e 1d -e "s/^\(.*\)$/_\1/g" >> 
$output_objdir/$libname.def;
+       else
+         cat $export_symbols | $SED -e "s/^\(.*\)$/_\1/g" >> 
$output_objdir/$libname.def;
+       fi~
+       $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs 
$compiler_flags $output_objdir/$libname.def~
+       emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o 
$output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
@@ -6407,7 +6445,26 @@ if test yes != "$_lt_caught_CXX_error"; then
        _LT_TAGVAR(hardcode_minus_L, $1)=yes
        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
        shrext_cmds=".dll"
-       _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} 
INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION 
\"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> 
$output_objdir/$libname.def~$ECHO "  MULTIPLE NONSHARED" >> 
$output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp 
$libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~$CC -Zdll 
-Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags 
$output_objdir/$libname.def~emximp -o $lib $output_objdir/$libname.def'
+       _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} 
INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+         $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+         $ECHO DATA >> $output_objdir/$libname.def~
+         $ECHO "  MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+         $ECHO EXPORTS >> $output_objdir/$libname.def~
+         emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> 
$output_objdir/$libname.def~
+         $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs 
$compiler_flags $output_objdir/$libname.def~
+         emximp -o $lib $output_objdir/$libname.def'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY 
${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+         $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+         $ECHO DATA >> $output_objdir/$libname.def~
+         $ECHO "  MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+         $ECHO EXPORTS >> $output_objdir/$libname.def~
+         if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+           cat $export_symbols | $SED -e 1d -e "s/^\(.*\)$/_\1/g" >> 
$output_objdir/$libname.def;
+         else
+           cat $export_symbols | $SED -e "s/^\(.*\)$/_\1/g" >> 
$output_objdir/$libname.def;
+         fi~
+         $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs 
$compiler_flags $output_objdir/$libname.def~
+         emximp -o $lib $output_objdir/$libname.def'
        _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o 
$output_objdir/${libname}_dll.a $output_objdir/$libname.def'
        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
        ;;
-- 
1.7.3.2