mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-05-09 01:14:24 +02:00
libtool.m4: Use echo in archive_cmds and archive_expsym_cmds on OS/2
Fixes that building DLLs fails because $ECHO does not work when it's set to "printf %s\n". From https://github.com/komh/libtool-os2
This commit is contained in:
50
acinclude/libtool.m4
vendored
50
acinclude/libtool.m4
vendored
@@ -1,3 +1,5 @@
|
||||
# Based on libtool-2.4.6 with additional patches, customized for SDL
|
||||
#
|
||||
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
||||
#
|
||||
# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
|
||||
@@ -5161,17 +5163,17 @@ _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 MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
|
||||
$ECHO EXPORTS >> $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 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 MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
|
||||
$ECHO EXPORTS >> $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 MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
|
||||
echo EXPORTS >> $output_objdir/$libname.def~
|
||||
prefix_cmds="$SED"~
|
||||
if test EXPORTS = "`$SED 1q $export_symbols`"; then
|
||||
prefix_cmds="$prefix_cmds -e 1d";
|
||||
@@ -5867,17 +5869,17 @@ _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 MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
|
||||
$ECHO EXPORTS >> $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 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 MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
|
||||
$ECHO EXPORTS >> $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 MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
|
||||
echo EXPORTS >> $output_objdir/$libname.def~
|
||||
prefix_cmds="$SED"~
|
||||
if test EXPORTS = "`$SED 1q $export_symbols`"; then
|
||||
prefix_cmds="$prefix_cmds -e 1d";
|
||||
@@ -6737,17 +6739,17 @@ 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 MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
|
||||
$ECHO EXPORTS >> $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 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 MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
|
||||
$ECHO EXPORTS >> $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 MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
|
||||
echo EXPORTS >> $output_objdir/$libname.def~
|
||||
prefix_cmds="$SED"~
|
||||
if test EXPORTS = "`$SED 1q $export_symbols`"; then
|
||||
prefix_cmds="$prefix_cmds -e 1d";
|
||||
|
||||
Reference in New Issue
Block a user