Changeset 764


Ignore:
Timestamp:
Jun 18, 2014, 5:52:49 PM (11 years ago)
Author:
dmik
Message:

libtool: Fix .DEF file generation on OS/2.

Defer $ECHO expansion to make \n in printf %s\n survive
double expansion with (eval of eval).

File:
1 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified libtool/trunk/libltdl/m4/libtool.m4

    r761 r764  
    48044804      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
    48054805      shrext_cmds=".dll"
    4806       _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY `eval $os2dllname_cmds` 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 $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
     4806      _LT_TAGVAR(archive_cmds, $1)='\$ECHO "LIBRARY `eval $os2dllname_cmds` 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 $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
    48074807      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
    48084808      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
    … …  
    54335433      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
    54345434      shrext_cmds=".dll"
    5435       _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY `eval $os2dllname_cmds` 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 $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
     5435      _LT_TAGVAR(archive_cmds, $1)='\$ECHO "LIBRARY `eval $os2dllname_cmds` 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 $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
    54365436      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
    54375437      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
    … …  
    62326232        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
    62336233        shrext_cmds=".dll"
    6234         _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY `eval $os2dllname_cmds` 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 $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
     6234        _LT_TAGVAR(archive_cmds, $1)='\$ECHO "LIBRARY `eval $os2dllname_cmds` 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 $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
    62356235        _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
    62366236        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
Note: See TracChangeset for help on using the changeset viewer.