mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-01-12 14:06:37 +08:00
* ltconfig.in: some cosmetical changes
* ltmain.in: ditto
This commit is contained in:
Thomas Tanner
parent
992f8947dc
commit
b990064c0f
@ -1,3 +1,8 @@
|
||||
1999-03-16 Thomas Tanner <tanner@gmx.de>
|
||||
|
||||
* ltconfig.in: some cosmetical changes
|
||||
* ltmain.in: ditto
|
||||
|
||||
1999-03-15 Alexandre Oliva <oliva@dcc.unicamp.br>
|
||||
|
||||
* configure.in, libtool.spec, NEWS: bump to 1.3a
|
||||
|
||||
18
ltconfig.in
18
ltconfig.in
@ -1012,7 +1012,7 @@ export_symbols_cmds='$NM $libobjs | $global_symbol_pipe | sed '\''s/.* //'\'' |
|
||||
# included in the symbol list
|
||||
include_expsyms=
|
||||
# exclude_expsyms can be an egrep regular expression of symbols to exclude
|
||||
# it will be wrapped by ` (' and `)$', so one must not match beginning or
|
||||
# it will be wrapped by `^(' and `) ', so one must not match beginning or
|
||||
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
|
||||
# as well as any symbol that contains `d'.
|
||||
exclude_expsyms=
|
||||
@ -1087,7 +1087,7 @@ EOF
|
||||
# then regenerate the def file from the symbol export list, so that
|
||||
# the compiled dll only exports the symbol export list.
|
||||
export_symbols_cmds='rm -f $objdir/$soname-ltdll.c~
|
||||
sed -e "/^# \/\* ltdll.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
|
||||
sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
|
||||
(cd $objdir && $CC -c $soname-ltdll.c)~
|
||||
$DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def $objdir/$soname-ltdll.$objext $libobjs~
|
||||
sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ; *//" < $objdir/$soname-def > $export_symbols'
|
||||
@ -1095,7 +1095,7 @@ EOF
|
||||
archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
|
||||
_lt_hint=1;
|
||||
for symbol in `cat $export_symbols`; do
|
||||
echo " \$symbol @ \$_lt_hint ; " >> $objdir/$soname-def;
|
||||
echo " \$symbol @ \$_lt_hint ; " >> $objdir/$soname-def;
|
||||
_lt_hint=`expr 1 + \$_lt_hint`;
|
||||
done~
|
||||
$CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
|
||||
@ -2587,7 +2587,7 @@ libext="$libext"
|
||||
# Additional compiler flags for building library objects.
|
||||
pic_flag=$pic_flag
|
||||
|
||||
# Does compiler simultaneously support -c and -o options
|
||||
# Does compiler simultaneously support -c and -o options?
|
||||
compiler_c_o=$compiler_c_o
|
||||
|
||||
# Can we write directly to a .lo ?
|
||||
@ -2657,7 +2657,7 @@ postuninstall_cmds=$postuninstall_cmds
|
||||
# Method to check whether dependent libraries are shared objects.
|
||||
deplibs_check_method=$deplibs_check_method
|
||||
|
||||
# Command to use when deplibs_check_method == file_magic
|
||||
# Command to use when deplibs_check_method == file_magic.
|
||||
file_magic_cmd=$file_magic_cmd
|
||||
|
||||
# Flag that allows shared libraries with undefined symbols to be built.
|
||||
@ -2718,16 +2718,16 @@ sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
|
||||
# Fix the shell variable \$srcfile for the compiler.
|
||||
fix_srcfile_path="$fix_srcfile_path"
|
||||
|
||||
# Set to yes if exported symbols are required
|
||||
# Set to yes if exported symbols are required.
|
||||
always_export_symbols=$always_export_symbols
|
||||
|
||||
# The command to extract exported symbols
|
||||
# The commands to list exported symbols.
|
||||
export_symbols_cmds=$export_symbols_cmds
|
||||
|
||||
# Symbols that should not be listed in the preloaded symbols
|
||||
# Symbols that should not be listed in the preloaded symbols.
|
||||
exclude_expsyms=$exclude_expsyms
|
||||
|
||||
# Symbols that must always be exported
|
||||
# Symbols that must always be exported.
|
||||
include_expsyms=$include_expsyms
|
||||
|
||||
EOF
|
||||
|
||||
44
ltmain.in
44
ltmain.in
@ -1128,6 +1128,7 @@ compiler."
|
||||
# it will not redefine variable installed.
|
||||
installed=yes
|
||||
|
||||
# Read the .la file
|
||||
# If there is no directory component, then add one.
|
||||
case "$arg" in
|
||||
*/* | *\\*) . $arg ;;
|
||||
@ -1747,12 +1748,13 @@ compiler."
|
||||
droppeddeps=no
|
||||
case "$deplibs_check_method" in
|
||||
pass_all)
|
||||
# Don't check for shared/static. Everything works.
|
||||
# This might be a little naive. We might want to check
|
||||
# whether the library exists or not. But this is on
|
||||
# osf3 & osf4 and I'm not really sure... Just
|
||||
# implementing what was already the behaviour.
|
||||
newdeplibs=$deplibs
|
||||
;; # Don't check for shared/static. Everything works.
|
||||
# This might be a little naive. We might want to check
|
||||
# whether the library exists or not. But this is on
|
||||
# osf3 & osf4 and I'm not really sure... Just
|
||||
# implementing what was already the behaviour.
|
||||
;;
|
||||
test_compile)
|
||||
# This code stresses the "libraries are programs" paradigm to its
|
||||
# limits. Maybe even breaks it. We compile a program, linking it
|
||||
@ -1800,20 +1802,20 @@ EOF
|
||||
# Did it work?
|
||||
if test $? -eq 0 ; then
|
||||
ldd_output=`ldd conftest`
|
||||
libname=`eval \\$echo \"$libname_spec\"`
|
||||
deplib_matches=`eval \\$echo \"$library_names_spec\"`
|
||||
set dummy $deplib_matches
|
||||
deplib_match=$2
|
||||
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
newdeplibs="$newdeplibs $i"
|
||||
else
|
||||
droppeddeps=yes
|
||||
echo
|
||||
echo "*** Warning: This library needs some functionality provided by $i."
|
||||
echo "*** I have the capability to make that library automatically link in when"
|
||||
echo "*** you link to this library. But I can only do this if you have a"
|
||||
echo "*** shared version of the library, which you do not appear to have."
|
||||
fi
|
||||
libname=`eval \\$echo \"$libname_spec\"`
|
||||
deplib_matches=`eval \\$echo \"$library_names_spec\"`
|
||||
set dummy $deplib_matches
|
||||
deplib_match=$2
|
||||
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
newdeplibs="$newdeplibs $i"
|
||||
else
|
||||
droppeddeps=yes
|
||||
echo
|
||||
echo "*** Warning: This library needs some functionality provided by $i."
|
||||
echo "*** I have the capability to make that library automatically link in when"
|
||||
echo "*** you link to this library. But I can only do this if you have a"
|
||||
echo "*** shared version of the library, which you do not appear to have."
|
||||
fi
|
||||
else
|
||||
droppeddeps=yes
|
||||
echo
|
||||
@ -2207,7 +2209,6 @@ EOF
|
||||
fi
|
||||
else
|
||||
eval flag=\"$hardcode_libdir_flag_spec\"
|
||||
|
||||
rpath="$rpath $flag"
|
||||
fi
|
||||
elif test -n "$runpath_var"; then
|
||||
@ -2244,7 +2245,6 @@ EOF
|
||||
fi
|
||||
else
|
||||
eval flag=\"$hardcode_libdir_flag_spec\"
|
||||
|
||||
rpath="$rpath $flag"
|
||||
fi
|
||||
elif test -n "$runpath_var"; then
|
||||
@ -2426,7 +2426,7 @@ static const void *lt_preloaded_setup() {
|
||||
fi
|
||||
|
||||
pic_flag_for_symtable=
|
||||
case "$host" in
|
||||
case "$host" in
|
||||
# compiling the symbol table file with pic_flag works around
|
||||
# a FreeBSD bug that causes programs to crash when -lm is
|
||||
# linked before any other PIC object. But we must not use
|
||||
|
||||
Loading…
Reference in New Issue
Block a user