1999-10-30 18:39:28 +08:00
|
|
|
# ltmain.sh - Provide generalized library-building support services.
|
My thanks to Alexandre Duret-Lutz <adl@gnu.org> for the insight
required to write this changeset -- especially that ltmain.sh is
the same on any machine for a given release, which I hadn't
noticed for some bizarre reason: It turns out that generating
distributed files from configure causes no end of hassle, as
evidenced by the many patches I've generated over the last few
days to try and get the dist and distcheck make rules to work.
Instead of all that hair, we now simply generate our distributed
files (now including ltmain.sh) with make rules -- and since
automake creates make variables for all AC_SUBSTs, that is really
easy. The code looks a lot more like automake and autoconf
Makefile.ams now, and doesn't have all the rough edges the earlier
hacky solution suffered from. We still generate libtool from
config.status, but that is not a distributed file, and doesn't
break the golden rule. Besides, there is way more going on there
than a bunch of substitutions:
* Makefile.am (edit): New common sed substitutions for files now
generated by make instead of config.status.
(CLEANFILES): Clean new tmp files.
(EXTRA_DIST): Add ltmain.sh.
(vcl-tmp): Reinstated.
(m4/ltversion.m4, config/ltmain.sh): New rules. Generate from
here instead of config.status.
(libtoolize): Ditto.
(libtool): Call config.status to regenerate if necessary.
(dist-hook): Removed.
* config/ltmain.in: Moved here from top_srcdir.
* README-alpha: Update instructions to check AS_SHELL_SANITIZE is
up to date.
* bootstrap: Rewritten. Generate m4/ltversion.m4 and
config/ltmain.sh because configure depends on them.
* configure.ac (AC_CONFIG_SRCDIR): Use libtoolize.in now that
ltmain.in has moved.
(AC_CONFIG_FILES): Don't generate distributed files,
config/ltmain.sh and libtoolize from config.status. We have make
rules to do that now.
2004-07-31 07:02:39 +08:00
|
|
|
# @configure_input@
|
1999-10-30 18:39:28 +08:00
|
|
|
#
|
2004-01-02 09:59:11 +08:00
|
|
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
|
2001-03-06 19:16:05 +08:00
|
|
|
# Free Software Foundation, Inc.
|
1999-10-30 18:39:28 +08:00
|
|
|
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
|
|
|
#
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful, but
|
|
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
# General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with this program; if not, write to the Free Software
|
|
|
|
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
#
|
|
|
|
# As a special exception to the GNU General Public License, if you
|
|
|
|
# distribute this file as part of a program that contains a
|
|
|
|
# configuration script generated by Autoconf, you may include it under
|
|
|
|
# the same distribution terms that you use for the rest of that program.
|
|
|
|
|
2004-07-28 22:57:28 +08:00
|
|
|
# Be Bourne compatible
|
|
|
|
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
|
|
emulate sh
|
|
|
|
NULLCMD=:
|
|
|
|
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
|
|
# is contrary to our usage. Disable this feature.
|
|
|
|
alias -g '${1+"$@"}'='"$@"'
|
2004-06-24 20:21:41 +08:00
|
|
|
setopt NO_GLOB_SUBST
|
2004-07-28 22:57:28 +08:00
|
|
|
elif test -n "${BASH_VERSION+set}${KSH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
|
|
|
|
set -o posix
|
2004-06-24 20:21:41 +08:00
|
|
|
fi
|
2004-07-28 22:57:28 +08:00
|
|
|
DUALCASE=1; export DUALCASE # for MKS sh
|
2004-02-12 20:27:46 +08:00
|
|
|
|
2004-02-13 03:22:28 +08:00
|
|
|
basename="s,^.*/,,g"
|
2004-02-12 20:27:46 +08:00
|
|
|
|
|
|
|
# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
|
|
|
|
# is ksh but when the shell is invoked as "sh" and the current value of
|
|
|
|
# the _XPG environment variable is not equal to 1 (one), the special
|
|
|
|
# positional parameter $0, within a function call, is the name of the
|
|
|
|
# function.
|
|
|
|
progpath="$0"
|
|
|
|
|
|
|
|
# The name of this program:
|
2004-02-13 15:26:08 +08:00
|
|
|
progname=`echo "$progpath" | $SED "$basename"`
|
2004-02-12 20:27:46 +08:00
|
|
|
modename="$progname"
|
|
|
|
|
|
|
|
# Global variables:
|
|
|
|
EXIT_SUCCESS=0
|
|
|
|
EXIT_FAILURE=1
|
|
|
|
EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
|
|
|
|
|
|
|
|
PROGRAM=ltmain.sh
|
|
|
|
PACKAGE=@PACKAGE@
|
|
|
|
VERSION=@VERSION@
|
|
|
|
TIMESTAMP="@TIMESTAMP@"
|
2004-07-29 00:14:01 +08:00
|
|
|
package_revision=@package_revision@
|
2004-02-12 20:27:46 +08:00
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# Check that we have a working $echo.
|
|
|
|
if test "X$1" = X--no-reexec; then
|
|
|
|
# Discard the --no-reexec flag, and continue.
|
|
|
|
shift
|
|
|
|
elif test "X$1" = X--fallback-echo; then
|
|
|
|
# Avoid inline document here, it may be left over
|
|
|
|
:
|
|
|
|
elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
|
|
|
|
# Yippee, $echo works!
|
|
|
|
:
|
|
|
|
else
|
|
|
|
# Restart under the correct shell, and then maybe $echo will work.
|
2004-02-12 20:27:46 +08:00
|
|
|
exec $SHELL "$progpath" --no-reexec ${1+"$@"}
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test "X$1" = X--fallback-echo; then
|
|
|
|
# used as fallback echo
|
|
|
|
shift
|
|
|
|
cat <<EOF
|
|
|
|
$*
|
|
|
|
EOF
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_SUCCESS
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
default_mode=
|
|
|
|
help="Try \`$progname --help' for more information."
|
|
|
|
magic="%%%MAGIC variable%%%"
|
|
|
|
mkdir="mkdir"
|
|
|
|
mv="mv -f"
|
|
|
|
rm="rm -f"
|
|
|
|
|
2004-02-07 01:23:40 +08:00
|
|
|
# Ensure that we are using m4 macros, and libtool script from the same
|
|
|
|
# release of libtool.
|
|
|
|
if test "$package_revision" != "$macro_revision"; then
|
|
|
|
if test "$VERSION" != "$macro_version"; then
|
|
|
|
if test -z "$macro_version"; then
|
|
|
|
cat >&2 <<_LT_EOF
|
|
|
|
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
|
2004-07-29 00:14:01 +08:00
|
|
|
$progname: definition of this LT_INIT comes from an older release.
|
2004-02-13 02:41:26 +08:00
|
|
|
$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
|
2004-02-07 01:23:40 +08:00
|
|
|
$progname: and run autoconf again.
|
|
|
|
_LT_EOF
|
|
|
|
else
|
|
|
|
cat >&2 <<_LT_EOF
|
|
|
|
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
|
2004-07-29 00:14:01 +08:00
|
|
|
$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
|
2004-02-13 02:41:26 +08:00
|
|
|
$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
|
2004-02-07 01:23:40 +08:00
|
|
|
$progname: and run autoconf again.
|
|
|
|
_LT_EOF
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
cat >&2 <<_LT_EOF
|
|
|
|
$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
|
2004-07-29 00:14:01 +08:00
|
|
|
$progname: but the definition of this LT_INIT comes from revision $macro_revision.
|
2004-02-13 02:41:26 +08:00
|
|
|
$progname: You should recreate aclocal.m4 with macros from revision $package_revision
|
2004-02-07 01:23:40 +08:00
|
|
|
$progname: of $PACKAGE $VERSION and run autoconf again.
|
|
|
|
_LT_EOF
|
|
|
|
fi
|
|
|
|
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_MISMATCH
|
2004-02-07 01:23:40 +08:00
|
|
|
fi
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# Sed substitution that helps us do robust quoting. It backslashifies
|
|
|
|
# metacharacters that are still active within double-quoted strings.
|
2002-01-30 06:58:35 +08:00
|
|
|
Xsed="${SED}"' -e 1s/^X//'
|
1999-10-30 18:39:28 +08:00
|
|
|
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
|
2002-06-13 19:01:47 +08:00
|
|
|
# test EBCDIC or ASCII
|
2003-06-02 12:42:34 +08:00
|
|
|
case `echo A|tr A '\301'` in
|
|
|
|
A) # EBCDIC based system
|
2002-06-13 19:01:47 +08:00
|
|
|
SP2NL="tr '\100' '\n'"
|
|
|
|
NL2SP="tr '\r\n' '\100\100'"
|
|
|
|
;;
|
|
|
|
*) # Assume ASCII based system
|
|
|
|
SP2NL="tr '\040' '\012'"
|
|
|
|
NL2SP="tr '\015\012' '\040\040'"
|
|
|
|
;;
|
|
|
|
esac
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
# NLS nuisances.
|
|
|
|
# Only set LANG and LC_ALL to C if already set.
|
|
|
|
# These must not be set unconditionally because not all systems understand
|
|
|
|
# e.g. LANG=C (notably SCO).
|
|
|
|
# We save the old values to restore during execute mode.
|
|
|
|
if test "${LC_ALL+set}" = set; then
|
|
|
|
save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
|
|
|
|
fi
|
|
|
|
if test "${LANG+set}" = set; then
|
|
|
|
save_LANG="$LANG"; LANG=C; export LANG
|
|
|
|
fi
|
|
|
|
|
2001-09-11 07:33:26 +08:00
|
|
|
# Make sure IFS has a sensible default
|
2004-02-24 00:00:37 +08:00
|
|
|
: ${IFS="
|
|
|
|
"}
|
2001-09-11 07:33:26 +08:00
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "$modename: not configured to build any kind of library" 1>&2
|
|
|
|
$echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Global variables.
|
|
|
|
mode=$default_mode
|
|
|
|
nonopt=
|
|
|
|
prev=
|
|
|
|
prevopt=
|
|
|
|
run=
|
|
|
|
show="$echo"
|
|
|
|
show_help=
|
|
|
|
execute_dlfiles=
|
|
|
|
lo2o="s/\\.lo\$/.${objext}/"
|
|
|
|
o2lo="s/\\.${objext}\$/.lo/"
|
|
|
|
|
2002-10-31 08:52:39 +08:00
|
|
|
#####################################
|
|
|
|
# Shell function definitions:
|
|
|
|
# This seems to be the best place for them
|
|
|
|
|
2004-02-05 22:53:16 +08:00
|
|
|
# func_win32_libid arg
|
|
|
|
# return the library type of file 'arg'
|
|
|
|
#
|
2002-10-31 08:52:39 +08:00
|
|
|
# Need a lot of goo to handle *both* DLLs and import libs
|
Don't assume that egrep and fgrep exist. POSIX 1003.1-2001 no
longer requires them; you're supposed to use grep -E and grep -F
instead. Also, don't assume that "test -a" works, since POSIX
doesn't require it.
* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER, _LT_AC_LANG_C_CONFIG,
_LT_AC_LANG_CXX_CONFIG, AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE,
AC_LIBTOOL_PROG_LD_SHLIBS):
egrep -> grep, when that makes no difference.
* libtoolize.in: Likewise.
* ltdl.m4 (AC_LTDL_SYMBOL_USCORE): Likewise.
* ltmain.in: Likewise.
* demo/Makefile.am (hc-direct): Likewise.
* pdemo/Makefile.am (hc-direct): Likewise.
* tests/build-relink.test, tests/build-relink2.test,
tests/cdemo-conf.test, tests/cdemo-shared.test,
tests/cdemo-static.test, tests/demo-conf.test,
tests/demo-nofast.test, tests/demo-shared.test,
tests/demo-static.test, tests/depdemo-conf.test,
tests/depdemo-nofast.test, tests/depdemo-shared.test,
tests/depdemo-static.test, tests/hardcode.test,
tests/mdemo-conf.test, tests/mdemo-shared.test,
tests/mdemo-static.test, tests/pdemo-conf.test,
tests/tagdemo-conf.test, tests/tagdemo-shared.test,
tests/tagdemo-static.test: Likewise.
* libtool.m4 (AC_PROG_EGREP):
New macro, defined if Autoconf doesn't define.
(AC_PATH_TOOL_PREFIX, AC_PROG_LD_GNU): Use it.
(AC_PROG_LD, AC_PROG_NM, AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE):
Use shell pattern matching rather than egrep.
(AC_LIBTOOL_CONFIG): Set lt_EGREP and EGREP.
* demo/Makefile.am (SET_HARDCODE_FLAGS): Use sed instead of egrep.
* pdemo/Makefile.am (SET_HARDCODE_FLAGS): Likewise.
* tests/defs (EGREP, FGREP): New vars.
* ltmain.in: egrep -> $EGREP
* tests/assign.test, tests/demo-exec.test, tests/demo-inst.test,
tests/pdemo-exec.test, tests/pdemo-inst.test, tests/sh.test:
Likewise.
* tests/hardcode.test: fgrep -> $FGREP
* tests/f77demo-exec.test: test -a -> test &&
2002-11-19 17:42:39 +08:00
|
|
|
# Has to be a shell function in order to 'eat' the argument
|
2002-10-31 08:52:39 +08:00
|
|
|
# that is supplied when $file_magic_command is called.
|
2004-02-05 22:53:16 +08:00
|
|
|
func_win32_libid () {
|
2002-10-31 08:52:39 +08:00
|
|
|
win32_libid_type="unknown"
|
2003-02-18 02:55:45 +08:00
|
|
|
win32_fileres=`file -L $1 2>/dev/null`
|
|
|
|
case $win32_fileres in
|
|
|
|
*ar\ archive\ import\ library*) # definitely import
|
|
|
|
win32_libid_type="x86 archive import"
|
|
|
|
;;
|
|
|
|
*ar\ archive*) # could be an import, or static
|
2004-02-13 07:47:46 +08:00
|
|
|
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
|
|
|
|
$EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
|
|
|
|
win32_nmres=`eval $NM -f posix -A $1 |
|
2003-04-01 00:06:45 +08:00
|
|
|
sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
|
2003-02-18 02:55:45 +08:00
|
|
|
if test "X$win32_nmres" = "Ximport" ; then
|
2004-08-26 17:02:42 +08:00
|
|
|
win32_libid_type="x86 archive import"
|
2003-02-18 02:55:45 +08:00
|
|
|
else
|
2004-08-26 17:02:42 +08:00
|
|
|
win32_libid_type="x86 archive static"
|
2002-10-31 08:52:39 +08:00
|
|
|
fi
|
|
|
|
fi
|
2003-02-18 02:55:45 +08:00
|
|
|
;;
|
2003-09-10 16:40:42 +08:00
|
|
|
*DLL*)
|
2003-02-18 02:55:45 +08:00
|
|
|
win32_libid_type="x86 DLL"
|
|
|
|
;;
|
|
|
|
*executable*) # but shell scripts are "executable" too...
|
|
|
|
case $win32_fileres in
|
|
|
|
*MS\ Windows\ PE\ Intel*)
|
|
|
|
win32_libid_type="x86 DLL"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
esac
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo $win32_libid_type
|
2002-10-31 08:52:39 +08:00
|
|
|
}
|
|
|
|
|
2004-02-04 22:39:02 +08:00
|
|
|
|
|
|
|
|
2004-02-05 22:53:16 +08:00
|
|
|
# func_infer_tag arg
|
|
|
|
# Infer tagged configuration to use if any are available and
|
|
|
|
# if one wasn't chosen via the "--tag" command line option.
|
|
|
|
# Only attempt this if the compiler in the base compile
|
|
|
|
# command doesn't match the default compiler.
|
|
|
|
# arg is usually of the form 'gcc ...'
|
|
|
|
func_infer_tag () {
|
2004-02-04 22:39:02 +08:00
|
|
|
if test -n "$available_tags" && test -z "$tagname"; then
|
|
|
|
CC_quoted=
|
|
|
|
for arg in $CC; do
|
|
|
|
case $arg in
|
|
|
|
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
|
|
|
arg="\"$arg\""
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
CC_quoted="$CC_quoted $arg"
|
|
|
|
done
|
|
|
|
case $@ in
|
|
|
|
# Blanks in the command may have been stripped by the calling shell,
|
|
|
|
# but not from the CC environment variable when configure was run.
|
|
|
|
" $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
|
|
|
|
# Blanks at the start of $base_compile will cause this to fail
|
|
|
|
# if we don't check for them as well.
|
|
|
|
*)
|
|
|
|
for z in $available_tags; do
|
2004-02-13 07:47:46 +08:00
|
|
|
if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
|
2004-02-04 22:39:02 +08:00
|
|
|
# Evaluate the configuration.
|
2004-02-12 20:27:46 +08:00
|
|
|
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
|
2004-02-04 22:39:02 +08:00
|
|
|
CC_quoted=
|
|
|
|
for arg in $CC; do
|
|
|
|
# Double-quote args containing other shell metacharacters.
|
|
|
|
case $arg in
|
|
|
|
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
|
|
|
arg="\"$arg\""
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
CC_quoted="$CC_quoted $arg"
|
|
|
|
done
|
|
|
|
case "$@ " in
|
|
|
|
" $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
|
|
|
|
# The compiler in the base compile command matches
|
|
|
|
# the one in the tagged configuration.
|
|
|
|
# Assume this is the tagged configuration we want.
|
|
|
|
tagname=$z
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
# If $tagname still isn't set, then no tagged configuration
|
|
|
|
# was found and let the user know that the "--tag" command
|
|
|
|
# line option must be used.
|
|
|
|
if test -z "$tagname"; then
|
|
|
|
$echo "$modename: unable to infer tagged configuration"
|
|
|
|
$echo "$modename: specify a tag with \`--tag'" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2004-08-26 17:02:42 +08:00
|
|
|
# else
|
|
|
|
# $echo "$modename: using $tagname tagged configuration"
|
2004-02-04 22:39:02 +08:00
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
}
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_generate_dlsyms outputname originator pic_p
|
|
|
|
# Extract symbols from dlprefiles and create ${outputname}S.o with
|
|
|
|
# a dlpreopen symbol table.
|
|
|
|
func_generate_dlsyms () {
|
|
|
|
my_outputname="$1"
|
|
|
|
my_originator="$2"
|
|
|
|
my_pic_p="${3-no}"
|
|
|
|
my_prefix=`echo "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
|
|
|
|
my_dlsyms=
|
|
|
|
|
|
|
|
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
|
|
|
if test -n "$NM" && test -n "$global_symbol_pipe"; then
|
2004-08-26 17:02:42 +08:00
|
|
|
my_dlsyms="${my_outputname}S.c"
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
else
|
|
|
|
$echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$my_dlsyms"; then
|
|
|
|
case $my_dlsyms in
|
|
|
|
"") ;;
|
|
|
|
*.c)
|
|
|
|
# Discover the nlist of each of the dlfiles.
|
|
|
|
nlist="$output_objdir/${my_outputname}.nm"
|
|
|
|
|
|
|
|
$show "$rm $nlist ${nlist}S ${nlist}T"
|
|
|
|
$run $rm "$nlist" "${nlist}S" "${nlist}T"
|
|
|
|
|
|
|
|
# Parse the name list into a source file.
|
|
|
|
$show "creating $output_objdir/$my_dlsyms"
|
|
|
|
|
|
|
|
test -z "$run" && $echo > "$output_objdir/$my_dlsyms" "\
|
|
|
|
/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
|
|
|
|
/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
extern \"C\" {
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* External symbol declarations for the compiler. */\
|
|
|
|
"
|
|
|
|
|
|
|
|
if test "$dlself" = yes; then
|
|
|
|
$show "generating symbol list for \`$output'"
|
|
|
|
|
|
|
|
test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
|
|
|
|
|
|
|
|
# Add our own program objects to the symbol list.
|
|
|
|
progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
|
|
|
|
for arg in $progfiles; do
|
|
|
|
$show "extracting global C symbols from \`$arg'"
|
|
|
|
$run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
|
|
|
|
done
|
|
|
|
|
|
|
|
if test -n "$exclude_expsyms"; then
|
|
|
|
$run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
|
|
|
|
$run eval '$mv "$nlist"T "$nlist"'
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$export_symbols_regex"; then
|
|
|
|
$run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
|
|
|
|
$run eval '$mv "$nlist"T "$nlist"'
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Prepare the list of exported symbols
|
|
|
|
if test -z "$export_symbols"; then
|
|
|
|
export_symbols="$output_objdir/$output.exp"
|
|
|
|
$run $rm $export_symbols
|
|
|
|
$run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
|
|
|
|
else
|
|
|
|
$run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
|
|
|
|
$run eval '$GREP -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
|
|
|
|
$run eval 'mv "$nlist"T "$nlist"'
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
for arg in $dlprefiles; do
|
|
|
|
$show "extracting global C symbols from \`$arg'"
|
|
|
|
name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
|
|
|
|
$run eval '$echo ": $name " >> "$nlist"'
|
|
|
|
$run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
|
|
|
|
done
|
|
|
|
|
|
|
|
if test -z "$run"; then
|
|
|
|
# Make sure we have at least an empty file.
|
|
|
|
test -f "$nlist" || : > "$nlist"
|
|
|
|
|
|
|
|
if test -n "$exclude_expsyms"; then
|
|
|
|
$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
|
|
|
|
$mv "$nlist"T "$nlist"
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Try sorting and uniquifying the output.
|
|
|
|
if $GREP -v "^: " < "$nlist" |
|
|
|
|
if sort -k 3 </dev/null >/dev/null 2>&1; then
|
|
|
|
sort -k 3
|
|
|
|
else
|
2004-08-26 17:02:42 +08:00
|
|
|
sort +2
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
fi |
|
|
|
|
uniq > "$nlist"S; then
|
|
|
|
:
|
|
|
|
else
|
|
|
|
$GREP -v "^: " < "$nlist" > "$nlist"S
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -f "$nlist"S; then
|
|
|
|
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
|
|
|
|
else
|
|
|
|
$echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
|
|
|
|
fi
|
|
|
|
|
|
|
|
$echo >> "$output_objdir/$my_dlsyms" "\
|
|
|
|
|
|
|
|
/* The mapping between symbol names and symbols. */
|
|
|
|
const struct {
|
|
|
|
const char *originator;
|
|
|
|
const struct {
|
|
|
|
const char *name;
|
|
|
|
void *address;
|
|
|
|
} symbols[];
|
|
|
|
}
|
|
|
|
lt_${my_prefix}_LTX_preloaded_symbols =
|
|
|
|
{\
|
|
|
|
\"$my_originator\",
|
|
|
|
{
|
|
|
|
"
|
|
|
|
|
|
|
|
eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
|
|
|
|
|
|
|
|
$echo >> "$output_objdir/$my_dlsyms" "\
|
|
|
|
{0, (void *) 0}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
/* This works around a problem in FreeBSD linker */
|
|
|
|
#ifdef FREEBSD_WORKAROUND
|
|
|
|
static const void *lt_preloaded_setup() {
|
|
|
|
return lt_${my_prefix}_LTX_preloaded_symbols;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
}
|
|
|
|
#endif\
|
|
|
|
"
|
|
|
|
fi
|
|
|
|
|
|
|
|
pic_flag_for_symtable=
|
|
|
|
case "$compile_command " in
|
|
|
|
*" -static "*) ;;
|
|
|
|
*)
|
|
|
|
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
|
|
|
|
# pic_flag when linking with -static. The problem exists in
|
|
|
|
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
|
|
|
|
*-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
|
|
|
|
pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
|
|
|
|
*-*-hpux*)
|
|
|
|
pic_flag_for_symtable=" $pic_flag" ;;
|
|
|
|
*)
|
|
|
|
if test "X$my_pic_p" != Xno; then
|
|
|
|
pic_flag_for_symtable=" $pic_flag"
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
# Now compile the dynamic symbol file.
|
|
|
|
$show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$my_dlsyms\")"
|
|
|
|
$run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' || exit $?
|
|
|
|
|
|
|
|
# Clean up the generated files.
|
|
|
|
$show "$rm $output_objdir/$my_dlsyms $nlist ${nlist}S ${nlist}T"
|
|
|
|
$run $rm "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"
|
|
|
|
|
|
|
|
# Transform the symbol file into the correct name.
|
|
|
|
symfileobj="$output_objdir/${my_outputname}S.$objext"
|
|
|
|
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
|
|
|
|
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
$echo "$modename: unknown suffix for \`$my_dlsyms'" 1>&2
|
|
|
|
exit $EXIT_FAILURE
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
else
|
|
|
|
# We keep going just in case the user didn't refer to
|
|
|
|
# lt_preloaded_symbols. The linker will fail if global_symbol_pipe
|
|
|
|
# really was required.
|
|
|
|
|
|
|
|
# Nullify the symbol file.
|
|
|
|
compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
|
|
|
|
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# func_extract_archives gentop oldlib ...
|
|
|
|
func_extract_archives () {
|
|
|
|
my_gentop="$1"; shift
|
|
|
|
my_oldlibs=${1+"$@"}
|
|
|
|
my_oldobjs=""
|
|
|
|
my_xlib=""
|
|
|
|
my_xabs=""
|
|
|
|
my_xdir=""
|
|
|
|
my_status=""
|
|
|
|
|
|
|
|
$show "${rm}r $my_gentop"
|
|
|
|
$run ${rm}r "$my_gentop"
|
|
|
|
$show "$mkdir $my_gentop"
|
|
|
|
$run $mkdir "$my_gentop"
|
|
|
|
my_status=$?
|
|
|
|
if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
|
|
|
|
exit $my_status
|
|
|
|
fi
|
|
|
|
|
|
|
|
for my_xlib in $my_oldlibs; do
|
|
|
|
# Extract the objects.
|
|
|
|
case $my_xlib in
|
|
|
|
[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
|
|
|
|
*) my_xabs=`pwd`"/$my_xlib" ;;
|
|
|
|
esac
|
|
|
|
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
|
|
|
|
my_xdir="$my_gentop/$my_xlib"
|
|
|
|
|
|
|
|
$show "${rm}r $my_xdir"
|
|
|
|
$run ${rm}r "$my_xdir"
|
|
|
|
$show "$mkdir $my_xdir"
|
|
|
|
$run $mkdir "$my_xdir"
|
|
|
|
status=$?
|
|
|
|
if test "$status" -ne 0 && test ! -d "$my_xdir"; then
|
|
|
|
exit $status
|
|
|
|
fi
|
2004-07-20 22:53:11 +08:00
|
|
|
case $host in
|
|
|
|
*-darwin*)
|
2004-07-22 21:37:52 +08:00
|
|
|
$show "Extracting $my_xabs"
|
|
|
|
# Do not bother doing anything if just a dry run
|
|
|
|
if test -z "$run"; then
|
|
|
|
darwin_orig_dir=`pwd`
|
|
|
|
cd $my_xdir || exit $?
|
|
|
|
darwin_archive=$my_xabs
|
|
|
|
darwin_curdir=`pwd`
|
|
|
|
darwin_base_archive=`basename $darwin_archive`
|
|
|
|
darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null`
|
2004-07-28 22:57:28 +08:00
|
|
|
if test -n "$darwin_arches"; then
|
2004-07-22 21:59:19 +08:00
|
|
|
darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
|
2004-07-22 21:37:52 +08:00
|
|
|
darwin_arch=
|
|
|
|
$show "$darwin_base_archive has multiple architectures $darwin_arches"
|
|
|
|
for darwin_arch in $darwin_arches ; do
|
|
|
|
mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
|
|
|
|
lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
|
|
|
|
# Remove the table of contents from the thin files.
|
|
|
|
$AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF 2>/dev/null || true
|
|
|
|
$AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF\ SORTED 2>/dev/null || true
|
|
|
|
cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
|
|
|
|
$AR -xo "${darwin_base_archive}"
|
|
|
|
rm "${darwin_base_archive}"
|
|
|
|
cd "$darwin_curdir"
|
|
|
|
done # $darwin_arches
|
2004-07-20 22:53:11 +08:00
|
|
|
## Okay now we have a bunch of thin objects, gotta fatten them up :)
|
2004-07-22 21:37:52 +08:00
|
|
|
darwin_filelist=`find unfat-$$ -type f | xargs basename | sort -u | $NL2SP`
|
|
|
|
darwin_file=
|
|
|
|
darwin_files=
|
|
|
|
for darwin_file in $darwin_filelist; do
|
2004-07-20 22:53:11 +08:00
|
|
|
darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
|
2004-07-22 21:37:52 +08:00
|
|
|
lipo -create -output "$darwin_file" $darwin_files
|
|
|
|
done # $darwin_filelist
|
|
|
|
rm -rf unfat-$$
|
|
|
|
cd "$darwin_orig_dir"
|
|
|
|
else
|
|
|
|
cd $darwin_orig_dir
|
|
|
|
(cd $my_xdir && $AR x $my_xabs) || exit $?
|
|
|
|
fi # $darwin_arches
|
|
|
|
fi # $run
|
2004-07-20 22:53:11 +08:00
|
|
|
;;
|
|
|
|
*)
|
|
|
|
# We will extract separately just the conflicting names and we will
|
|
|
|
# no longer touch any unique names. It is faster to leave these
|
|
|
|
# extract automatically by $AR in one run.
|
|
|
|
$show "(cd $my_xdir && $AR x $my_xabs)"
|
|
|
|
$run eval "(cd \$my_xdir && $AR x \$my_xabs)" || exit $?
|
|
|
|
if ($AR t "$my_xabs" | sort | sort -uc >/dev/null 2>&1); then
|
|
|
|
:
|
|
|
|
else
|
|
|
|
$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
|
|
|
|
$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
|
|
|
|
$AR t "$my_xabs" | sort | uniq -cd | while read -r count name
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
do
|
2004-07-20 22:53:11 +08:00
|
|
|
i=1
|
|
|
|
while test "$i" -le "$count"
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
do
|
2004-07-20 22:53:11 +08:00
|
|
|
# Put our $i before any first dot (extension)
|
|
|
|
# Never overwrite any file
|
|
|
|
name_to="$name"
|
|
|
|
while test "X$name_to" = "X$name" || test -f "$my_xdir/$name_to"
|
|
|
|
do
|
|
|
|
name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
|
|
|
|
done
|
|
|
|
$show "(cd $my_xdir && $AR xN $i $my_xabs '$name' && $mv '$name' '$name_to')"
|
|
|
|
$run eval "(cd \$my_xdir && $AR xN $i \$my_xabs '$name' && $mv '$name' '$name_to')" || exit $?
|
|
|
|
i=`expr $i + 1`
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
done
|
|
|
|
done
|
2004-07-20 22:53:11 +08:00
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
|
|
|
|
done
|
|
|
|
|
|
|
|
func_extract_archives_result="$my_oldobjs"
|
|
|
|
}
|
2002-10-31 08:52:39 +08:00
|
|
|
# End of Shell function definitions
|
|
|
|
#####################################
|
|
|
|
|
2003-10-05 22:50:14 +08:00
|
|
|
# Shorthand for --mode=foo
|
|
|
|
case $1 in
|
2003-10-07 22:51:06 +08:00
|
|
|
clean|clea|cle|cl)
|
|
|
|
shift; set -- --mode=clean ${1+"$@"}
|
|
|
|
;;
|
2003-10-07 22:34:45 +08:00
|
|
|
compile|compil|compi|comp|com|co|c)
|
2003-10-05 22:50:14 +08:00
|
|
|
shift; set -- --mode=compile ${1+"$@"}
|
|
|
|
;;
|
|
|
|
execute|execut|execu|exec|exe|ex|e)
|
|
|
|
shift; set -- --mode=execute ${1+"$@"}
|
|
|
|
;;
|
2003-10-07 22:51:06 +08:00
|
|
|
finish|finis|fini|fin|fi|f)
|
|
|
|
shift; set -- --mode=finish ${1+"$@"}
|
|
|
|
;;
|
2003-10-05 22:50:14 +08:00
|
|
|
install|instal|insta|inst|ins|in|i)
|
|
|
|
shift; set -- --mode=install ${1+"$@"}
|
|
|
|
;;
|
|
|
|
link|lin|li|l)
|
|
|
|
shift; set -- --mode=link ${1+"$@"}
|
|
|
|
;;
|
|
|
|
uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
|
|
|
|
shift; set -- --mode=uninstall ${1+"$@"}
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2004-02-15 21:30:01 +08:00
|
|
|
# Darwin sucks
|
|
|
|
eval std_shrext=\"$shrext_cmds\"
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# Parse our command line options once, thoroughly.
|
2001-07-30 00:20:45 +08:00
|
|
|
while test "$#" -gt 0
|
1999-10-30 18:39:28 +08:00
|
|
|
do
|
|
|
|
arg="$1"
|
|
|
|
shift
|
|
|
|
|
2001-03-06 04:08:09 +08:00
|
|
|
case $arg in
|
1999-10-30 18:39:28 +08:00
|
|
|
-*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
|
|
|
|
*) optarg= ;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
# If the previous option needs an argument, assign it.
|
|
|
|
if test -n "$prev"; then
|
2001-03-06 04:08:09 +08:00
|
|
|
case $prev in
|
1999-10-30 18:39:28 +08:00
|
|
|
execute_dlfiles)
|
2000-10-02 09:18:16 +08:00
|
|
|
execute_dlfiles="$execute_dlfiles $arg"
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
2001-05-28 07:20:45 +08:00
|
|
|
tag)
|
|
|
|
tagname="$arg"
|
2003-10-20 21:36:10 +08:00
|
|
|
preserve_args="${preserve_args}=$arg"
|
2001-05-28 07:20:45 +08:00
|
|
|
|
|
|
|
# Check whether tagname contains only valid characters
|
|
|
|
case $tagname in
|
|
|
|
*[!-_A-Za-z0-9,/]*)
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "$progname: invalid tag name: $tagname" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2001-09-03 06:07:38 +08:00
|
|
|
;;
|
2001-05-28 07:20:45 +08:00
|
|
|
esac
|
|
|
|
|
|
|
|
case $tagname in
|
|
|
|
CC)
|
|
|
|
# Don't test for the "default" C tag, as we know, it's there, but
|
|
|
|
# not specially marked.
|
|
|
|
;;
|
|
|
|
*)
|
2004-02-12 20:27:46 +08:00
|
|
|
if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
|
2001-09-03 06:07:38 +08:00
|
|
|
taglist="$taglist $tagname"
|
2001-05-28 07:20:45 +08:00
|
|
|
# Evaluate the configuration.
|
2004-02-12 20:27:46 +08:00
|
|
|
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
|
2001-09-03 06:07:38 +08:00
|
|
|
else
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "$progname: ignoring unknown tag $tagname" 1>&2
|
2001-09-03 06:07:38 +08:00
|
|
|
fi
|
|
|
|
;;
|
2001-05-28 07:20:45 +08:00
|
|
|
esac
|
|
|
|
;;
|
1999-10-30 18:39:28 +08:00
|
|
|
*)
|
|
|
|
eval "$prev=\$arg"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
prev=
|
|
|
|
prevopt=
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Have we seen a non-optional argument yet?
|
2001-03-06 04:08:09 +08:00
|
|
|
case $arg in
|
1999-10-30 18:39:28 +08:00
|
|
|
--help)
|
|
|
|
show_help=yes
|
|
|
|
;;
|
|
|
|
|
|
|
|
--version)
|
2003-11-26 20:34:23 +08:00
|
|
|
$echo "$PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION"
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo
|
2004-01-07 03:26:17 +08:00
|
|
|
$echo "Copyright (C) 2004 Free Software Foundation, Inc."
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "This is free software; see the source for copying conditions. There is NO"
|
|
|
|
$echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_SUCCESS
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
|
|
|
--config)
|
2004-02-12 20:27:46 +08:00
|
|
|
${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
|
2001-05-28 07:20:45 +08:00
|
|
|
# Now print the configurations for the tags.
|
|
|
|
for tagname in $taglist; do
|
2004-02-12 20:27:46 +08:00
|
|
|
${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
|
2001-05-28 07:20:45 +08:00
|
|
|
done
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_SUCCESS
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
|
|
|
--debug)
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "$progname: enabling shell trace mode"
|
1999-10-30 18:39:28 +08:00
|
|
|
set -x
|
2003-10-20 21:36:10 +08:00
|
|
|
preserve_args="$preserve_args $arg"
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
|
|
|
--dry-run | -n)
|
|
|
|
run=:
|
|
|
|
;;
|
|
|
|
|
|
|
|
--features)
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "host: $host"
|
1999-10-30 18:39:28 +08:00
|
|
|
if test "$build_libtool_libs" = yes; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "enable shared libraries"
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "disable shared libraries"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
if test "$build_old_libs" = yes; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "enable static libraries"
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "disable static libraries"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_SUCCESS
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
|
|
|
--finish) mode="finish" ;;
|
|
|
|
|
|
|
|
--mode) prevopt="--mode" prev=mode ;;
|
|
|
|
--mode=*) mode="$optarg" ;;
|
|
|
|
|
2001-11-28 03:31:22 +08:00
|
|
|
--preserve-dup-deps) duplicate_deps="yes" ;;
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
--quiet | --silent)
|
|
|
|
show=:
|
2003-10-20 21:36:10 +08:00
|
|
|
preserve_args="$preserve_args $arg"
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
2001-05-28 07:20:45 +08:00
|
|
|
--tag) prevopt="--tag" prev=tag ;;
|
|
|
|
--tag=*)
|
|
|
|
set tag "$optarg" ${1+"$@"}
|
|
|
|
shift
|
|
|
|
prev=tag
|
2003-10-20 21:36:10 +08:00
|
|
|
preserve_args="$preserve_args --tag"
|
2001-05-28 07:20:45 +08:00
|
|
|
;;
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
-dlopen)
|
|
|
|
prevopt="-dlopen"
|
|
|
|
prev=execute_dlfiles
|
|
|
|
;;
|
|
|
|
|
|
|
|
-*)
|
|
|
|
$echo "$modename: unrecognized option \`$arg'" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
|
|
|
*)
|
|
|
|
nonopt="$arg"
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
|
|
|
if test -n "$prevopt"; then
|
|
|
|
$echo "$modename: option \`$prevopt' requires an argument" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
2001-06-26 04:42:45 +08:00
|
|
|
# If this variable is set in any of the actions, the command in it
|
|
|
|
# will be execed at the end. This prevents here-documents from being
|
|
|
|
# left over by shells.
|
|
|
|
exec_cmd=
|
|
|
|
|
2003-10-05 22:50:14 +08:00
|
|
|
if test -z "$show_help"; then
|
|
|
|
if test -z "$mode"; then
|
|
|
|
$echo "$modename: error: you must specify a MODE." 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2003-10-05 22:50:14 +08:00
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
# Only execute mode is allowed to have -dlopen flags.
|
|
|
|
if test -n "$execute_dlfiles" && test "$mode" != execute; then
|
|
|
|
$echo "$modename: unrecognized option \`-dlopen'" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Change the help message to a mode-specific one.
|
|
|
|
generic_help="$help"
|
|
|
|
help="Try \`$modename --help --mode=$mode' for more information."
|
|
|
|
|
|
|
|
# These modes are in order of execution frequency so that they run quickly.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $mode in
|
1999-10-30 18:39:28 +08:00
|
|
|
# libtool compile mode
|
|
|
|
compile)
|
|
|
|
modename="$modename: compile"
|
|
|
|
# Get the compilation command and the source file.
|
|
|
|
base_compile=
|
2002-03-12 10:30:33 +08:00
|
|
|
srcfile="$nonopt" # always keep a non-empty value in "srcfile"
|
2003-10-08 01:13:42 +08:00
|
|
|
suppress_opt=yes
|
1999-10-30 18:39:28 +08:00
|
|
|
suppress_output=
|
2002-03-12 10:30:33 +08:00
|
|
|
arg_mode=normal
|
|
|
|
libobj=
|
2003-11-17 19:19:07 +08:00
|
|
|
later=
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
for arg
|
|
|
|
do
|
2002-03-12 10:30:33 +08:00
|
|
|
case "$arg_mode" in
|
|
|
|
arg )
|
2002-03-15 05:43:50 +08:00
|
|
|
# do not "continue". Instead, add this to base_compile
|
|
|
|
lastarg="$arg"
|
2002-03-12 10:30:33 +08:00
|
|
|
arg_mode=normal
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
2002-03-12 10:30:33 +08:00
|
|
|
target )
|
|
|
|
libobj="$arg"
|
|
|
|
arg_mode=normal
|
1999-10-30 18:39:28 +08:00
|
|
|
continue
|
|
|
|
;;
|
1999-12-18 16:22:50 +08:00
|
|
|
|
2002-03-12 10:30:33 +08:00
|
|
|
normal )
|
|
|
|
# Accept any command-line options.
|
|
|
|
case $arg in
|
|
|
|
-o)
|
|
|
|
if test -n "$libobj" ; then
|
|
|
|
$echo "$modename: you cannot specify \`-o' more than once" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2002-03-12 10:30:33 +08:00
|
|
|
fi
|
|
|
|
arg_mode=target
|
|
|
|
continue
|
|
|
|
;;
|
2000-04-11 02:39:30 +08:00
|
|
|
|
2003-11-17 19:19:07 +08:00
|
|
|
-shared | -static | -prefer-pic | -prefer-non-pic)
|
|
|
|
later="$later $arg"
|
2002-03-12 10:30:33 +08:00
|
|
|
continue
|
|
|
|
;;
|
1999-12-18 16:22:50 +08:00
|
|
|
|
2003-10-08 01:13:42 +08:00
|
|
|
-no-suppress)
|
|
|
|
suppress_opt=no
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
2002-03-12 10:30:33 +08:00
|
|
|
-Xcompiler)
|
|
|
|
arg_mode=arg # the next one goes into the "base_compile" arg list
|
|
|
|
continue # The current "srcfile" will either be retained or
|
|
|
|
;; # replaced later. I would guess that would be a bug.
|
|
|
|
|
|
|
|
-Wc,*)
|
|
|
|
args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
|
|
|
|
lastarg=
|
|
|
|
save_ifs="$IFS"; IFS=','
|
|
|
|
for arg in $args; do
|
|
|
|
IFS="$save_ifs"
|
|
|
|
|
|
|
|
# Double-quote args containing other shell metacharacters.
|
|
|
|
# Many Bourne shells cannot handle close brackets correctly
|
|
|
|
# in scan sets, so we specify it separately.
|
|
|
|
case $arg in
|
|
|
|
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
|
|
|
arg="\"$arg\""
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
lastarg="$lastarg $arg"
|
|
|
|
done
|
1999-12-18 16:22:50 +08:00
|
|
|
IFS="$save_ifs"
|
2002-03-12 10:30:33 +08:00
|
|
|
lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
|
1999-12-18 16:22:50 +08:00
|
|
|
|
2002-03-12 10:30:33 +08:00
|
|
|
# Add the arguments to base_compile.
|
1999-12-18 16:22:50 +08:00
|
|
|
base_compile="$base_compile $lastarg"
|
2002-03-12 10:30:33 +08:00
|
|
|
continue
|
|
|
|
;;
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2002-03-12 10:30:33 +08:00
|
|
|
* )
|
|
|
|
# Accept the current argument as the source file.
|
|
|
|
# The previous "srcfile" becomes the current argument.
|
|
|
|
#
|
|
|
|
lastarg="$srcfile"
|
|
|
|
srcfile="$arg"
|
|
|
|
;;
|
|
|
|
esac # case $arg
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
2002-03-12 10:30:33 +08:00
|
|
|
esac # case $arg_mode
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
# Aesthetically quote the previous argument.
|
|
|
|
lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
|
|
|
|
|
2002-03-12 10:30:33 +08:00
|
|
|
case $lastarg in
|
1999-10-30 18:39:28 +08:00
|
|
|
# Double-quote args containing other shell metacharacters.
|
1999-12-18 16:22:50 +08:00
|
|
|
# Many Bourne shells cannot handle close brackets correctly
|
|
|
|
# in scan sets, so we specify it separately.
|
|
|
|
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
2000-01-20 04:34:37 +08:00
|
|
|
lastarg="\"$lastarg\""
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2002-03-12 10:30:33 +08:00
|
|
|
base_compile="$base_compile $lastarg"
|
|
|
|
done # for arg
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2002-03-12 10:30:33 +08:00
|
|
|
case $arg_mode in
|
|
|
|
arg)
|
|
|
|
$echo "$modename: you must specify an argument for -Xcompile"
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
2002-03-12 10:30:33 +08:00
|
|
|
target)
|
1999-10-30 18:39:28 +08:00
|
|
|
$echo "$modename: you must specify a target with \`-o'" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
2002-03-12 10:30:33 +08:00
|
|
|
*)
|
|
|
|
# Get the name of the library object.
|
|
|
|
[ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
|
|
|
|
;;
|
1999-10-30 18:39:28 +08:00
|
|
|
esac
|
|
|
|
|
|
|
|
# Recognize several different file suffixes.
|
|
|
|
# If the user specifies -o file.o, it is replaced with file.lo
|
2001-07-26 07:20:15 +08:00
|
|
|
xform='[cCFSifmso]'
|
2001-03-06 04:08:09 +08:00
|
|
|
case $libobj in
|
1999-10-30 18:39:28 +08:00
|
|
|
*.ada) xform=ada ;;
|
|
|
|
*.adb) xform=adb ;;
|
|
|
|
*.ads) xform=ads ;;
|
|
|
|
*.asm) xform=asm ;;
|
|
|
|
*.c++) xform=c++ ;;
|
|
|
|
*.cc) xform=cc ;;
|
2001-07-26 07:20:15 +08:00
|
|
|
*.ii) xform=ii ;;
|
2001-05-28 07:20:45 +08:00
|
|
|
*.class) xform=class ;;
|
1999-10-30 18:39:28 +08:00
|
|
|
*.cpp) xform=cpp ;;
|
|
|
|
*.cxx) xform=cxx ;;
|
|
|
|
*.f90) xform=f90 ;;
|
|
|
|
*.for) xform=for ;;
|
2001-05-28 07:20:45 +08:00
|
|
|
*.java) xform=java ;;
|
1999-10-30 18:39:28 +08:00
|
|
|
esac
|
|
|
|
|
|
|
|
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
|
|
|
|
|
2001-03-06 04:08:09 +08:00
|
|
|
case $libobj in
|
1999-10-30 18:39:28 +08:00
|
|
|
*.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
|
|
|
|
*)
|
|
|
|
$echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
esac
|
2004-02-07 01:23:40 +08:00
|
|
|
|
2004-02-05 22:53:16 +08:00
|
|
|
func_infer_tag $base_compile
|
2001-05-28 07:20:45 +08:00
|
|
|
|
2003-11-17 19:19:07 +08:00
|
|
|
for arg in $later; do
|
|
|
|
case $arg in
|
|
|
|
-shared)
|
|
|
|
if test "$build_libtool_libs" != yes; then
|
|
|
|
$echo "$modename: can not build a shared library" 1>&2
|
|
|
|
$echo "Fatal configuration error." 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2003-11-17 19:19:07 +08:00
|
|
|
fi
|
|
|
|
build_old_libs=no
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-static)
|
|
|
|
build_libtool_libs=no
|
|
|
|
build_old_libs=yes
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-prefer-pic)
|
|
|
|
pic_mode=yes
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-prefer-non-pic)
|
|
|
|
pic_mode=no
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
2001-05-28 07:20:45 +08:00
|
|
|
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
|
|
|
|
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
|
|
|
|
if test "X$xdir" = "X$obj"; then
|
|
|
|
xdir=
|
|
|
|
else
|
|
|
|
xdir=$xdir/
|
|
|
|
fi
|
|
|
|
lobj=${xdir}$objdir/$objname
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
if test -z "$base_compile"; then
|
|
|
|
$echo "$modename: you must specify a compilation command" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Delete any leftover library objects.
|
|
|
|
if test "$build_old_libs" = yes; then
|
2001-05-28 07:20:45 +08:00
|
|
|
removelist="$obj $lobj $libobj ${libobj}T"
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
2001-05-28 07:20:45 +08:00
|
|
|
removelist="$lobj $libobj ${libobj}T"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
$run $rm $removelist
|
2004-02-12 20:27:46 +08:00
|
|
|
trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-04-11 02:39:30 +08:00
|
|
|
# On Cygwin there's no "real" PIC flag so we must build both object types
|
2001-03-06 04:08:09 +08:00
|
|
|
case $host_os in
|
2000-09-15 10:10:27 +08:00
|
|
|
cygwin* | mingw* | pw32* | os2*)
|
2000-04-11 02:39:30 +08:00
|
|
|
pic_mode=default
|
|
|
|
;;
|
|
|
|
esac
|
2001-07-26 07:20:15 +08:00
|
|
|
if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
|
2000-04-11 02:39:30 +08:00
|
|
|
# non-PIC code in shared libraries is not supported
|
|
|
|
pic_mode=default
|
|
|
|
fi
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# Calculate the filename of the output object if compiler does
|
|
|
|
# not support -o with -c
|
|
|
|
if test "$compiler_c_o" = no; then
|
2000-09-13 07:26:49 +08:00
|
|
|
output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
|
1999-10-30 18:39:28 +08:00
|
|
|
lockfile="$output_obj.lock"
|
|
|
|
removelist="$removelist $output_obj $lockfile"
|
2004-02-12 20:27:46 +08:00
|
|
|
trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
2001-05-28 07:20:45 +08:00
|
|
|
output_obj=
|
1999-10-30 18:39:28 +08:00
|
|
|
need_locks=no
|
|
|
|
lockfile=
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Lock this critical section if it is needed
|
|
|
|
# We use this script file to make the link, it avoids creating a new file
|
|
|
|
if test "$need_locks" = yes; then
|
2004-02-12 20:27:46 +08:00
|
|
|
until $run ln "$progpath" "$lockfile" 2>/dev/null; do
|
1999-10-30 18:39:28 +08:00
|
|
|
$show "Waiting for $lockfile to be removed"
|
|
|
|
sleep 2
|
|
|
|
done
|
|
|
|
elif test "$need_locks" = warn; then
|
|
|
|
if test -f "$lockfile"; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "\
|
1999-10-30 18:39:28 +08:00
|
|
|
*** ERROR, $lockfile exists and contains:
|
|
|
|
`cat $lockfile 2>/dev/null`
|
|
|
|
|
|
|
|
This indicates that another process is trying to use the same
|
|
|
|
temporary object file, and libtool could not work around it because
|
|
|
|
your compiler does not support \`-c' and \`-o' together. If you
|
|
|
|
repeat this compilation, it may succeed, by chance, but you had better
|
|
|
|
avoid parallel builds (make -j) in this platform, or get a better
|
|
|
|
compiler."
|
|
|
|
|
|
|
|
$run $rm $removelist
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo $srcfile > "$lockfile"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$fix_srcfile_path"; then
|
|
|
|
eval srcfile=\"$fix_srcfile_path\"
|
|
|
|
fi
|
|
|
|
|
2001-05-28 07:20:45 +08:00
|
|
|
$run $rm "$libobj" "${libobj}T"
|
|
|
|
|
|
|
|
# Create a libtool object file (analogous to a ".la" file),
|
|
|
|
# but don't create it if we're doing a dry run.
|
|
|
|
test -z "$run" && cat > ${libobj}T <<EOF
|
|
|
|
# $libobj - a libtool object file
|
2003-11-26 20:34:23 +08:00
|
|
|
# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
|
2001-05-28 07:20:45 +08:00
|
|
|
#
|
|
|
|
# Please DO NOT delete this file!
|
|
|
|
# It is necessary for linking the library.
|
|
|
|
|
|
|
|
# Name of the PIC object.
|
|
|
|
EOF
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# Only build a PIC object if we are building libtool libraries.
|
|
|
|
if test "$build_libtool_libs" = yes; then
|
|
|
|
# Without this assignment, base_compile gets emptied.
|
|
|
|
fbsd_hideous_sh_bug=$base_compile
|
|
|
|
|
|
|
|
if test "$pic_mode" != no; then
|
2001-05-28 07:20:45 +08:00
|
|
|
command="$base_compile $srcfile $pic_flag"
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
|
|
|
# Don't build PIC code
|
|
|
|
command="$base_compile $srcfile"
|
|
|
|
fi
|
|
|
|
|
2001-07-30 00:20:45 +08:00
|
|
|
if test ! -d "${xdir}$objdir"; then
|
2001-05-28 07:20:45 +08:00
|
|
|
$show "$mkdir ${xdir}$objdir"
|
|
|
|
$run $mkdir ${xdir}$objdir
|
|
|
|
status=$?
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
|
2001-05-28 07:20:45 +08:00
|
|
|
exit $status
|
2001-09-03 06:07:38 +08:00
|
|
|
fi
|
|
|
|
fi
|
2001-05-28 07:20:45 +08:00
|
|
|
|
|
|
|
if test -z "$output_obj"; then
|
2001-09-03 06:07:38 +08:00
|
|
|
# Place PIC objects in $objdir
|
|
|
|
command="$command -o $lobj"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
2001-05-28 07:20:45 +08:00
|
|
|
$run $rm "$lobj" "$output_obj"
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
$show "$command"
|
|
|
|
if $run eval "$command"; then :
|
|
|
|
else
|
|
|
|
test -n "$output_obj" && $run $rm $removelist
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test "$need_locks" = warn &&
|
2001-07-30 00:20:45 +08:00
|
|
|
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "\
|
1999-10-30 18:39:28 +08:00
|
|
|
*** ERROR, $lockfile contains:
|
|
|
|
`cat $lockfile 2>/dev/null`
|
|
|
|
|
|
|
|
but it should contain:
|
|
|
|
$srcfile
|
|
|
|
|
|
|
|
This indicates that another process is trying to use the same
|
|
|
|
temporary object file, and libtool could not work around it because
|
|
|
|
your compiler does not support \`-c' and \`-o' together. If you
|
|
|
|
repeat this compilation, it may succeed, by chance, but you had better
|
|
|
|
avoid parallel builds (make -j) in this platform, or get a better
|
|
|
|
compiler."
|
|
|
|
|
|
|
|
$run $rm $removelist
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Just move the object if needed, then go on to compile the next one
|
2001-07-30 00:35:50 +08:00
|
|
|
if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
|
2001-05-28 07:20:45 +08:00
|
|
|
$show "$mv $output_obj $lobj"
|
|
|
|
if $run $mv $output_obj $lobj; then :
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
|
|
|
error=$?
|
|
|
|
$run $rm $removelist
|
|
|
|
exit $error
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2001-05-28 07:20:45 +08:00
|
|
|
# Append the name of the PIC object to the libtool object file.
|
|
|
|
test -z "$run" && cat >> ${libobj}T <<EOF
|
|
|
|
pic_object='$objdir/$objname'
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2001-05-28 07:20:45 +08:00
|
|
|
EOF
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
# Allow error messages only from the first compilation.
|
2003-10-08 01:13:42 +08:00
|
|
|
if test "$suppress_opt" = yes; then
|
2004-08-26 17:02:42 +08:00
|
|
|
suppress_output=' >/dev/null 2>&1'
|
2003-10-08 01:13:42 +08:00
|
|
|
fi
|
2001-05-28 07:20:45 +08:00
|
|
|
else
|
|
|
|
# No PIC object so indicate it doesn't exist in the libtool
|
|
|
|
# object file.
|
|
|
|
test -z "$run" && cat >> ${libobj}T <<EOF
|
|
|
|
pic_object=none
|
|
|
|
|
|
|
|
EOF
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Only build a position-dependent object if we build old libraries.
|
|
|
|
if test "$build_old_libs" = yes; then
|
|
|
|
if test "$pic_mode" != yes; then
|
|
|
|
# Don't build PIC code
|
|
|
|
command="$base_compile $srcfile"
|
|
|
|
else
|
2001-05-28 07:20:45 +08:00
|
|
|
command="$base_compile $srcfile $pic_flag"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
if test "$compiler_c_o" = yes; then
|
|
|
|
command="$command -o $obj"
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Suppress compiler output if we already did a PIC compilation.
|
|
|
|
command="$command$suppress_output"
|
2001-05-28 07:20:45 +08:00
|
|
|
$run $rm "$obj" "$output_obj"
|
1999-10-30 18:39:28 +08:00
|
|
|
$show "$command"
|
|
|
|
if $run eval "$command"; then :
|
|
|
|
else
|
|
|
|
$run $rm $removelist
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test "$need_locks" = warn &&
|
2001-07-30 00:20:45 +08:00
|
|
|
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "\
|
1999-10-30 18:39:28 +08:00
|
|
|
*** ERROR, $lockfile contains:
|
|
|
|
`cat $lockfile 2>/dev/null`
|
|
|
|
|
|
|
|
but it should contain:
|
|
|
|
$srcfile
|
|
|
|
|
|
|
|
This indicates that another process is trying to use the same
|
|
|
|
temporary object file, and libtool could not work around it because
|
|
|
|
your compiler does not support \`-c' and \`-o' together. If you
|
|
|
|
repeat this compilation, it may succeed, by chance, but you had better
|
|
|
|
avoid parallel builds (make -j) in this platform, or get a better
|
|
|
|
compiler."
|
|
|
|
|
|
|
|
$run $rm $removelist
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Just move the object if needed
|
2001-07-30 00:35:50 +08:00
|
|
|
if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
|
1999-10-30 18:39:28 +08:00
|
|
|
$show "$mv $output_obj $obj"
|
|
|
|
if $run $mv $output_obj $obj; then :
|
|
|
|
else
|
|
|
|
error=$?
|
|
|
|
$run $rm $removelist
|
|
|
|
exit $error
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2001-05-28 07:20:45 +08:00
|
|
|
# Append the name of the non-PIC object the libtool object file.
|
|
|
|
# Only append if the libtool object file exists.
|
|
|
|
test -z "$run" && cat >> ${libobj}T <<EOF
|
|
|
|
# Name of the non-PIC object.
|
|
|
|
non_pic_object='$objname'
|
|
|
|
|
|
|
|
EOF
|
|
|
|
else
|
|
|
|
# Append the name of the non-PIC object the libtool object file.
|
|
|
|
# Only append if the libtool object file exists.
|
|
|
|
test -z "$run" && cat >> ${libobj}T <<EOF
|
|
|
|
# Name of the non-PIC object.
|
|
|
|
non_pic_object=none
|
|
|
|
|
|
|
|
EOF
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
2001-05-28 07:20:45 +08:00
|
|
|
$run $mv "${libobj}T" "${libobj}"
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# Unlock the critical section if it was locked
|
|
|
|
if test "$need_locks" != no; then
|
2000-09-04 14:29:21 +08:00
|
|
|
$run $rm "$lockfile"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_SUCCESS
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
|
|
|
# libtool link mode
|
|
|
|
link | relink)
|
|
|
|
modename="$modename: link"
|
2001-03-06 04:08:09 +08:00
|
|
|
case $host in
|
2000-09-15 10:10:27 +08:00
|
|
|
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
|
1999-10-30 18:39:28 +08:00
|
|
|
# It is impossible to link a dll without this setting, and
|
|
|
|
# we shouldn't force the makefile maintainer to figure out
|
|
|
|
# which system we are compiling for in order to pass an extra
|
2002-09-25 12:26:20 +08:00
|
|
|
# flag for every libtool invocation.
|
1999-10-30 18:39:28 +08:00
|
|
|
# allow_undefined=no
|
|
|
|
|
|
|
|
# FIXME: Unfortunately, there are problems with the above when trying
|
|
|
|
# to make a dll which has undefined symbols, in which case not
|
|
|
|
# even a static library is built. For now, we need to specify
|
|
|
|
# -no-undefined on the libtool link line when we can be certain
|
|
|
|
# that all symbols are satisfied, otherwise we get a static library.
|
|
|
|
allow_undefined=yes
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
allow_undefined=yes
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
libtool_args="$nonopt"
|
2003-12-31 09:33:53 +08:00
|
|
|
base_compile="$nonopt $@"
|
1999-10-30 18:39:28 +08:00
|
|
|
compile_command="$nonopt"
|
|
|
|
finalize_command="$nonopt"
|
|
|
|
|
|
|
|
compile_rpath=
|
|
|
|
finalize_rpath=
|
|
|
|
compile_shlibpath=
|
|
|
|
finalize_shlibpath=
|
|
|
|
convenience=
|
|
|
|
old_convenience=
|
|
|
|
deplibs=
|
|
|
|
old_deplibs=
|
|
|
|
compiler_flags=
|
|
|
|
linker_flags=
|
|
|
|
dllsearchpath=
|
|
|
|
lib_search_path=`pwd`
|
2002-11-04 01:35:37 +08:00
|
|
|
inst_prefix_dir=
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
avoid_version=no
|
|
|
|
dlfiles=
|
|
|
|
dlprefiles=
|
|
|
|
dlself=no
|
|
|
|
export_dynamic=no
|
|
|
|
export_symbols=
|
|
|
|
export_symbols_regex=
|
|
|
|
generated=
|
|
|
|
libobjs=
|
|
|
|
ltlibs=
|
|
|
|
module=no
|
|
|
|
no_install=no
|
|
|
|
objs=
|
2001-05-28 07:20:45 +08:00
|
|
|
non_pic_objects=
|
2004-01-12 10:32:50 +08:00
|
|
|
precious_files_regex=
|
1999-10-30 18:39:28 +08:00
|
|
|
prefer_static_libs=no
|
|
|
|
preload=no
|
|
|
|
prev=
|
|
|
|
prevarg=
|
|
|
|
release=
|
|
|
|
rpath=
|
|
|
|
xrpath=
|
|
|
|
perm_rpath=
|
|
|
|
temp_rpath=
|
|
|
|
thread_safe=no
|
|
|
|
vinfo=
|
2003-04-01 01:36:01 +08:00
|
|
|
vinfo_number=no
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2004-02-05 22:53:16 +08:00
|
|
|
func_infer_tag $base_compile
|
2003-11-17 19:19:07 +08:00
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# We need to know -static, to get the right output filenames.
|
|
|
|
for arg
|
|
|
|
do
|
2001-03-06 04:08:09 +08:00
|
|
|
case $arg in
|
2003-10-08 00:48:23 +08:00
|
|
|
-shared)
|
|
|
|
if test "$build_libtool_libs" != yes; then
|
|
|
|
$echo "$modename: can not build a shared library" 1>&2
|
|
|
|
$echo "Fatal configuration error." 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2003-10-08 00:48:23 +08:00
|
|
|
fi
|
|
|
|
build_old_libs=no
|
|
|
|
break
|
|
|
|
;;
|
1999-10-30 18:39:28 +08:00
|
|
|
-all-static | -static)
|
|
|
|
if test "X$arg" = "X-all-static"; then
|
|
|
|
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
|
|
|
|
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
|
|
|
|
fi
|
|
|
|
if test -n "$link_static_flag"; then
|
|
|
|
dlopen_self=$dlopen_self_static
|
2003-10-08 00:32:58 +08:00
|
|
|
# See comment for -static flag below, for more details.
|
|
|
|
compile_command="$compile_command $link_static_flag"
|
|
|
|
finalize_command="$finalize_command $link_static_flag"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
else
|
|
|
|
if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
|
|
|
dlopen_self=$dlopen_self_static
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
build_libtool_libs=no
|
|
|
|
build_old_libs=yes
|
|
|
|
prefer_static_libs=yes
|
|
|
|
break
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
|
|
|
# See if our shared archives depend on static archives.
|
|
|
|
test -n "$old_archive_from_new_cmds" && build_old_libs=yes
|
|
|
|
|
|
|
|
# Go through the arguments, transforming them on the way.
|
2001-07-30 00:20:45 +08:00
|
|
|
while test "$#" -gt 0; do
|
1999-10-30 18:39:28 +08:00
|
|
|
arg="$1"
|
|
|
|
shift
|
2001-03-06 04:08:09 +08:00
|
|
|
case $arg in
|
1999-12-18 15:50:04 +08:00
|
|
|
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
1999-12-18 15:09:44 +08:00
|
|
|
qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
|
1999-12-18 14:27:21 +08:00
|
|
|
;;
|
|
|
|
*) qarg=$arg ;;
|
|
|
|
esac
|
|
|
|
libtool_args="$libtool_args $qarg"
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
# If the previous option needs an argument, assign it.
|
|
|
|
if test -n "$prev"; then
|
2001-03-06 04:08:09 +08:00
|
|
|
case $prev in
|
1999-10-30 18:39:28 +08:00
|
|
|
output)
|
|
|
|
compile_command="$compile_command @OUTPUT@"
|
|
|
|
finalize_command="$finalize_command @OUTPUT@"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2001-03-06 04:08:09 +08:00
|
|
|
case $prev in
|
1999-10-30 18:39:28 +08:00
|
|
|
dlfiles|dlprefiles)
|
|
|
|
if test "$preload" = no; then
|
|
|
|
# Add the symbol object into the linking commands.
|
|
|
|
compile_command="$compile_command @SYMFILE@"
|
|
|
|
finalize_command="$finalize_command @SYMFILE@"
|
|
|
|
preload=yes
|
|
|
|
fi
|
2001-03-06 04:08:09 +08:00
|
|
|
case $arg in
|
1999-10-30 18:39:28 +08:00
|
|
|
*.la | *.lo) ;; # We handle these cases below.
|
|
|
|
force)
|
|
|
|
if test "$dlself" = no; then
|
|
|
|
dlself=needless
|
|
|
|
export_dynamic=yes
|
|
|
|
fi
|
|
|
|
prev=
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
self)
|
|
|
|
if test "$prev" = dlprefiles; then
|
|
|
|
dlself=yes
|
|
|
|
elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
|
|
|
|
dlself=yes
|
|
|
|
else
|
|
|
|
dlself=needless
|
|
|
|
export_dynamic=yes
|
|
|
|
fi
|
|
|
|
prev=
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
if test "$prev" = dlfiles; then
|
|
|
|
dlfiles="$dlfiles $arg"
|
|
|
|
else
|
|
|
|
dlprefiles="$dlprefiles $arg"
|
|
|
|
fi
|
|
|
|
prev=
|
2000-02-24 07:10:05 +08:00
|
|
|
continue
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
expsyms)
|
|
|
|
export_symbols="$arg"
|
|
|
|
if test ! -f "$arg"; then
|
|
|
|
$echo "$modename: symbol file \`$arg' does not exist"
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
prev=
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
expsyms_regex)
|
|
|
|
export_symbols_regex="$arg"
|
|
|
|
prev=
|
|
|
|
continue
|
|
|
|
;;
|
2002-11-04 01:35:37 +08:00
|
|
|
inst_prefix)
|
|
|
|
inst_prefix_dir="$arg"
|
|
|
|
prev=
|
|
|
|
continue
|
|
|
|
;;
|
2004-01-12 10:32:50 +08:00
|
|
|
precious_regex)
|
|
|
|
precious_files_regex="$arg"
|
|
|
|
prev=
|
|
|
|
continue
|
|
|
|
;;
|
1999-10-30 18:39:28 +08:00
|
|
|
release)
|
|
|
|
release="-$arg"
|
|
|
|
prev=
|
|
|
|
continue
|
|
|
|
;;
|
2001-05-28 07:20:45 +08:00
|
|
|
objectlist)
|
|
|
|
if test -f "$arg"; then
|
2001-09-03 06:07:38 +08:00
|
|
|
save_arg=$arg
|
2001-05-28 07:20:45 +08:00
|
|
|
moreargs=
|
|
|
|
for fil in `cat $save_arg`
|
|
|
|
do
|
|
|
|
# moreargs="$moreargs $fil"
|
2001-09-03 06:07:38 +08:00
|
|
|
arg=$fil
|
|
|
|
# A libtool-controlled object.
|
2001-05-28 07:20:45 +08:00
|
|
|
|
|
|
|
# Check to see that this really is a libtool object.
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
if (${SED} -e '2q' $arg | $GREP "^# Generated by ltmain.sh ") >/dev/null 2>&1; then
|
2001-09-03 06:07:38 +08:00
|
|
|
pic_object=
|
|
|
|
non_pic_object=
|
|
|
|
|
|
|
|
# Read the .lo file
|
|
|
|
# If there is no directory component, then add one.
|
|
|
|
case $arg in
|
|
|
|
*/* | *\\*) . $arg ;;
|
|
|
|
*) . ./$arg ;;
|
|
|
|
esac
|
|
|
|
|
2004-02-13 07:47:46 +08:00
|
|
|
if test -z "$pic_object" ||
|
2001-09-03 06:07:38 +08:00
|
|
|
test -z "$non_pic_object" ||
|
2004-02-13 07:47:46 +08:00
|
|
|
test "$pic_object" = none &&
|
2001-09-03 06:07:38 +08:00
|
|
|
test "$non_pic_object" = none; then
|
|
|
|
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2001-09-03 06:07:38 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Extract subdirectory from the argument.
|
|
|
|
xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
|
|
|
|
if test "X$xdir" = "X$arg"; then
|
|
|
|
xdir=
|
|
|
|
else
|
|
|
|
xdir="$xdir/"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "$pic_object" != none; then
|
|
|
|
# Prepend the subdirectory the object is found in.
|
|
|
|
pic_object="$xdir$pic_object"
|
|
|
|
|
|
|
|
if test "$prev" = dlfiles; then
|
|
|
|
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
|
|
|
|
dlfiles="$dlfiles $pic_object"
|
|
|
|
prev=
|
|
|
|
continue
|
|
|
|
else
|
|
|
|
# If libtool objects are unsupported, then we need to preload.
|
|
|
|
prev=dlprefiles
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
# CHECK ME: I think I busted this. -Ossama
|
|
|
|
if test "$prev" = dlprefiles; then
|
|
|
|
# Preload the old-style object.
|
|
|
|
dlprefiles="$dlprefiles $pic_object"
|
|
|
|
prev=
|
|
|
|
fi
|
|
|
|
|
|
|
|
# A PIC object.
|
|
|
|
libobjs="$libobjs $pic_object"
|
|
|
|
arg="$pic_object"
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Non-PIC object.
|
|
|
|
if test "$non_pic_object" != none; then
|
|
|
|
# Prepend the subdirectory the object is found in.
|
|
|
|
non_pic_object="$xdir$non_pic_object"
|
|
|
|
|
|
|
|
# A standard non-PIC object
|
|
|
|
non_pic_objects="$non_pic_objects $non_pic_object"
|
|
|
|
if test -z "$pic_object" || test "$pic_object" = none ; then
|
|
|
|
arg="$non_pic_object"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
# Only an error if not doing a dry-run.
|
|
|
|
if test -z "$run"; then
|
|
|
|
$echo "$modename: \`$arg' is not a valid libtool object" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2001-09-03 06:07:38 +08:00
|
|
|
else
|
|
|
|
# Dry-run case.
|
|
|
|
|
|
|
|
# Extract subdirectory from the argument.
|
|
|
|
xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
|
|
|
|
if test "X$xdir" = "X$arg"; then
|
|
|
|
xdir=
|
|
|
|
else
|
|
|
|
xdir="$xdir/"
|
|
|
|
fi
|
|
|
|
|
|
|
|
pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
|
|
|
|
non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
|
|
|
|
libobjs="$libobjs $pic_object"
|
|
|
|
non_pic_objects="$non_pic_objects $non_pic_object"
|
|
|
|
fi
|
2001-05-28 07:20:45 +08:00
|
|
|
fi
|
|
|
|
done
|
|
|
|
else
|
|
|
|
$echo "$modename: link input file \`$save_arg' does not exist"
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2001-05-28 07:20:45 +08:00
|
|
|
fi
|
2001-09-03 06:07:38 +08:00
|
|
|
arg=$save_arg
|
2001-05-28 07:20:45 +08:00
|
|
|
prev=
|
|
|
|
continue
|
|
|
|
;;
|
1999-10-30 18:39:28 +08:00
|
|
|
rpath | xrpath)
|
|
|
|
# We need an absolute path.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $arg in
|
1999-10-30 18:39:28 +08:00
|
|
|
[\\/]* | [A-Za-z]:[\\/]*) ;;
|
|
|
|
*)
|
|
|
|
$echo "$modename: only absolute run-paths are allowed" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
if test "$prev" = rpath; then
|
|
|
|
case "$rpath " in
|
|
|
|
*" $arg "*) ;;
|
|
|
|
*) rpath="$rpath $arg" ;;
|
|
|
|
esac
|
|
|
|
else
|
|
|
|
case "$xrpath " in
|
|
|
|
*" $arg "*) ;;
|
|
|
|
*) xrpath="$xrpath $arg" ;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
prev=
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
xcompiler)
|
1999-12-18 15:50:04 +08:00
|
|
|
compiler_flags="$compiler_flags $qarg"
|
1999-10-30 18:39:28 +08:00
|
|
|
prev=
|
1999-12-18 15:50:04 +08:00
|
|
|
compile_command="$compile_command $qarg"
|
|
|
|
finalize_command="$finalize_command $qarg"
|
1999-10-30 18:39:28 +08:00
|
|
|
continue
|
|
|
|
;;
|
|
|
|
xlinker)
|
1999-12-18 15:50:04 +08:00
|
|
|
linker_flags="$linker_flags $qarg"
|
|
|
|
compiler_flags="$compiler_flags $wl$qarg"
|
1999-10-30 18:39:28 +08:00
|
|
|
prev=
|
1999-12-18 15:50:04 +08:00
|
|
|
compile_command="$compile_command $wl$qarg"
|
|
|
|
finalize_command="$finalize_command $wl$qarg"
|
1999-10-30 18:39:28 +08:00
|
|
|
continue
|
|
|
|
;;
|
2002-10-28 23:38:37 +08:00
|
|
|
xcclinker)
|
|
|
|
linker_flags="$linker_flags $qarg"
|
|
|
|
compiler_flags="$compiler_flags $qarg"
|
|
|
|
prev=
|
|
|
|
compile_command="$compile_command $qarg"
|
|
|
|
finalize_command="$finalize_command $qarg"
|
|
|
|
continue
|
|
|
|
;;
|
2003-09-10 16:40:42 +08:00
|
|
|
framework)
|
|
|
|
case $host in
|
|
|
|
*-*-darwin*)
|
|
|
|
case "$deplibs " in
|
2004-08-26 17:02:42 +08:00
|
|
|
*" $qarg.ltframework "*) ;;
|
2004-01-19 12:57:26 +08:00
|
|
|
*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
|
2003-09-10 16:40:42 +08:00
|
|
|
;;
|
2004-08-26 17:02:42 +08:00
|
|
|
esac
|
|
|
|
;;
|
2003-09-10 16:40:42 +08:00
|
|
|
esac
|
|
|
|
prev=
|
|
|
|
continue
|
|
|
|
;;
|
2004-02-15 21:30:01 +08:00
|
|
|
shrext)
|
|
|
|
shrext_cmds="$arg"
|
|
|
|
prev=
|
|
|
|
continue
|
|
|
|
;;
|
1999-10-30 18:39:28 +08:00
|
|
|
*)
|
|
|
|
eval "$prev=\"\$arg\""
|
|
|
|
prev=
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
esac
|
2001-07-30 00:20:45 +08:00
|
|
|
fi # test -n "$prev"
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
prevarg="$arg"
|
|
|
|
|
2001-03-06 04:08:09 +08:00
|
|
|
case $arg in
|
1999-10-30 18:39:28 +08:00
|
|
|
-all-static)
|
2003-10-08 00:32:58 +08:00
|
|
|
# The effects of -all-static are defined in a previous loop.
|
1999-10-30 18:39:28 +08:00
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-allow-undefined)
|
|
|
|
# FIXME: remove this flag sometime in the future.
|
2003-10-05 23:27:34 +08:00
|
|
|
$echo "$modename: \`-allow-undefined' must not be used because it is the default" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
|
|
|
-avoid-version)
|
|
|
|
avoid_version=yes
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-dlopen)
|
|
|
|
prev=dlfiles
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-dlpreopen)
|
|
|
|
prev=dlprefiles
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-export-dynamic)
|
|
|
|
export_dynamic=yes
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-export-symbols | -export-symbols-regex)
|
|
|
|
if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
|
2001-04-25 04:30:21 +08:00
|
|
|
$echo "$modename: more than one -exported-symbols argument is not allowed"
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
if test "X$arg" = "X-export-symbols"; then
|
|
|
|
prev=expsyms
|
|
|
|
else
|
|
|
|
prev=expsyms_regex
|
|
|
|
fi
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
2002-11-04 01:35:37 +08:00
|
|
|
-inst-prefix-dir)
|
|
|
|
prev=inst_prefix
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
2000-08-27 18:50:23 +08:00
|
|
|
# The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
|
|
|
|
# so, if we see these flags be careful not to treat them like -L
|
|
|
|
-L[A-Z][A-Z]*:*)
|
|
|
|
case $with_gcc/$host in
|
2001-08-08 04:20:14 +08:00
|
|
|
no/*-*-irix* | /*-*-irix*)
|
2000-08-27 18:50:23 +08:00
|
|
|
compile_command="$compile_command $arg"
|
|
|
|
finalize_command="$finalize_command $arg"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
continue
|
|
|
|
;;
|
2001-04-25 04:30:21 +08:00
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
-L*)
|
|
|
|
dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
|
|
|
|
# We need an absolute path.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $dir in
|
1999-10-30 18:39:28 +08:00
|
|
|
[\\/]* | [A-Za-z]:[\\/]*) ;;
|
|
|
|
*)
|
|
|
|
absdir=`cd "$dir" && pwd`
|
|
|
|
if test -z "$absdir"; then
|
|
|
|
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
dir="$absdir"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
case "$deplibs " in
|
|
|
|
*" -L$dir "*) ;;
|
|
|
|
*)
|
|
|
|
deplibs="$deplibs -L$dir"
|
|
|
|
lib_search_path="$lib_search_path $dir"
|
|
|
|
;;
|
|
|
|
esac
|
2001-03-06 04:08:09 +08:00
|
|
|
case $host in
|
2000-09-15 10:10:27 +08:00
|
|
|
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
|
2001-03-06 04:08:09 +08:00
|
|
|
case :$dllsearchpath: in
|
1999-10-30 18:39:28 +08:00
|
|
|
*":$dir:"*) ;;
|
|
|
|
*) dllsearchpath="$dllsearchpath:$dir";;
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-l*)
|
2001-04-25 04:30:21 +08:00
|
|
|
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
|
2001-03-06 04:08:09 +08:00
|
|
|
case $host in
|
2000-09-15 10:10:27 +08:00
|
|
|
*-*-cygwin* | *-*-pw32* | *-*-beos*)
|
2001-04-25 04:30:21 +08:00
|
|
|
# These systems don't actually have a C or math library (as such)
|
1999-10-30 18:39:28 +08:00
|
|
|
continue
|
|
|
|
;;
|
2001-04-25 04:30:21 +08:00
|
|
|
*-*-mingw* | *-*-os2*)
|
|
|
|
# These systems don't actually have a C library (as such)
|
|
|
|
test "X$arg" = "X-lc" && continue
|
2000-12-16 21:08:14 +08:00
|
|
|
;;
|
2001-11-28 07:10:22 +08:00
|
|
|
*-*-openbsd* | *-*-freebsd*)
|
2001-08-19 06:25:17 +08:00
|
|
|
# Do not include libc due to us having libc/libc_r.
|
|
|
|
test "X$arg" = "X-lc" && continue
|
2001-06-28 01:56:09 +08:00
|
|
|
;;
|
2001-05-28 07:20:45 +08:00
|
|
|
*-*-rhapsody* | *-*-darwin1.[012])
|
|
|
|
# Rhapsody C and math libraries are in the System framework
|
2004-01-19 12:57:26 +08:00
|
|
|
deplibs="$deplibs System.ltframework"
|
2001-05-28 07:20:45 +08:00
|
|
|
continue
|
1999-10-30 18:39:28 +08:00
|
|
|
esac
|
2001-09-11 06:34:40 +08:00
|
|
|
elif test "X$arg" = "X-lc_r"; then
|
2001-09-03 06:07:38 +08:00
|
|
|
case $host in
|
2001-11-28 07:10:22 +08:00
|
|
|
*-*-openbsd* | *-*-freebsd*)
|
2001-09-03 06:07:38 +08:00
|
|
|
# Do not include libc_r directly, use -pthread flag.
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
deplibs="$deplibs $arg"
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-module)
|
|
|
|
module=yes
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
2003-11-11 05:06:49 +08:00
|
|
|
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
|
|
|
deplibs="$deplibs $arg"
|
|
|
|
continue
|
2004-08-26 17:02:42 +08:00
|
|
|
;;
|
2003-11-11 05:06:49 +08:00
|
|
|
|
2002-11-19 12:42:08 +08:00
|
|
|
# gcc -m* arguments should be passed to the linker via $compiler_flags
|
|
|
|
# in order to pass architecture information to the linker
|
|
|
|
# (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo
|
|
|
|
# but this is not reliable with gcc because gcc may use -mfoo to
|
|
|
|
# select a different linker, different libraries, etc, while
|
|
|
|
# -Wl,-mfoo simply passes -mfoo to the linker.
|
|
|
|
-m*)
|
|
|
|
# Unknown arguments in both finalize_command and compile_command need
|
|
|
|
# to be aesthetically quoted because they are evaled later.
|
|
|
|
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
|
|
|
|
case $arg in
|
|
|
|
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
|
|
|
arg="\"$arg\""
|
|
|
|
;;
|
|
|
|
esac
|
2004-08-26 17:02:42 +08:00
|
|
|
compile_command="$compile_command $arg"
|
|
|
|
finalize_command="$finalize_command $arg"
|
|
|
|
if test "$with_gcc" = "yes" ; then
|
|
|
|
compiler_flags="$compiler_flags $arg"
|
|
|
|
fi
|
|
|
|
continue
|
|
|
|
;;
|
2002-11-19 12:42:08 +08:00
|
|
|
|
2002-12-31 13:43:24 +08:00
|
|
|
-shrext)
|
|
|
|
prev=shrext
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
-no-fast-install)
|
|
|
|
fast_install=no
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-no-install)
|
2001-03-06 04:08:09 +08:00
|
|
|
case $host in
|
2000-09-15 10:10:27 +08:00
|
|
|
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
|
1999-10-30 18:39:28 +08:00
|
|
|
# The PATH hackery in wrapper scripts is required on Windows
|
|
|
|
# in order for the loader to find any dlls it needs.
|
|
|
|
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
|
|
|
|
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
|
|
|
|
fast_install=no
|
|
|
|
;;
|
2001-04-25 04:30:21 +08:00
|
|
|
*) no_install=yes ;;
|
1999-10-30 18:39:28 +08:00
|
|
|
esac
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-no-undefined)
|
|
|
|
allow_undefined=no
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
2001-05-28 07:20:45 +08:00
|
|
|
-objectlist)
|
|
|
|
prev=objectlist
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
-o) prev=output ;;
|
|
|
|
|
2004-01-12 10:32:50 +08:00
|
|
|
-precious-files-regex)
|
|
|
|
prev=precious_regex
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
-release)
|
|
|
|
prev=release
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-rpath)
|
|
|
|
prev=rpath
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-R)
|
|
|
|
prev=xrpath
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-R*)
|
|
|
|
dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
|
|
|
|
# We need an absolute path.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $dir in
|
1999-10-30 18:39:28 +08:00
|
|
|
[\\/]* | [A-Za-z]:[\\/]*) ;;
|
|
|
|
*)
|
|
|
|
$echo "$modename: only absolute run-paths are allowed" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
case "$xrpath " in
|
|
|
|
*" $dir "*) ;;
|
|
|
|
*) xrpath="$xrpath $dir" ;;
|
|
|
|
esac
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
2003-10-08 00:48:23 +08:00
|
|
|
-shared)
|
|
|
|
# The effects of -shared are defined in a previous loop.
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
-static)
|
2001-04-25 04:30:21 +08:00
|
|
|
# The effects of -static are defined in a previous loop.
|
2000-09-04 13:10:30 +08:00
|
|
|
# We used to do the same as -all-static on platforms that
|
|
|
|
# didn't have a PIC flag, but the assumption that the effects
|
|
|
|
# would be equivalent was wrong. It would break on at least
|
|
|
|
# Digital Unix and AIX.
|
1999-10-30 18:39:28 +08:00
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-thread-safe)
|
|
|
|
thread_safe=yes
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-version-info)
|
|
|
|
prev=vinfo
|
|
|
|
continue
|
|
|
|
;;
|
2003-04-01 01:36:01 +08:00
|
|
|
-version-number)
|
|
|
|
prev=vinfo
|
|
|
|
vinfo_number=yes
|
|
|
|
continue
|
|
|
|
;;
|
2000-01-25 04:34:46 +08:00
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
-Wc,*)
|
1999-12-18 15:50:04 +08:00
|
|
|
args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
|
|
|
|
arg=
|
2001-09-11 07:33:26 +08:00
|
|
|
save_ifs="$IFS"; IFS=','
|
1999-12-18 15:50:04 +08:00
|
|
|
for flag in $args; do
|
1999-12-18 15:02:40 +08:00
|
|
|
IFS="$save_ifs"
|
2001-03-06 04:08:09 +08:00
|
|
|
case $flag in
|
1999-12-18 15:50:04 +08:00
|
|
|
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
1999-12-18 15:02:40 +08:00
|
|
|
flag="\"$flag\""
|
|
|
|
;;
|
|
|
|
esac
|
1999-12-18 15:50:04 +08:00
|
|
|
arg="$arg $wl$flag"
|
1999-12-18 15:02:40 +08:00
|
|
|
compiler_flags="$compiler_flags $flag"
|
|
|
|
done
|
|
|
|
IFS="$save_ifs"
|
1999-12-18 15:50:04 +08:00
|
|
|
arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
|
|
|
-Wl,*)
|
1999-12-18 15:50:04 +08:00
|
|
|
args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
|
|
|
|
arg=
|
2001-09-11 07:33:26 +08:00
|
|
|
save_ifs="$IFS"; IFS=','
|
1999-12-18 15:50:04 +08:00
|
|
|
for flag in $args; do
|
1999-12-18 15:02:40 +08:00
|
|
|
IFS="$save_ifs"
|
2001-03-06 04:08:09 +08:00
|
|
|
case $flag in
|
1999-12-18 15:50:04 +08:00
|
|
|
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
1999-12-18 15:02:40 +08:00
|
|
|
flag="\"$flag\""
|
|
|
|
;;
|
|
|
|
esac
|
1999-12-18 15:50:04 +08:00
|
|
|
arg="$arg $wl$flag"
|
1999-12-18 15:02:40 +08:00
|
|
|
compiler_flags="$compiler_flags $wl$flag"
|
|
|
|
linker_flags="$linker_flags $flag"
|
|
|
|
done
|
|
|
|
IFS="$save_ifs"
|
1999-12-18 15:50:04 +08:00
|
|
|
arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
|
|
|
-Xcompiler)
|
|
|
|
prev=xcompiler
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
-Xlinker)
|
|
|
|
prev=xlinker
|
|
|
|
continue
|
|
|
|
;;
|
2002-10-28 23:38:37 +08:00
|
|
|
|
|
|
|
-XCClinker)
|
|
|
|
prev=xcclinker
|
|
|
|
continue
|
|
|
|
;;
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2003-09-10 16:40:42 +08:00
|
|
|
-framework)
|
2004-08-26 17:02:42 +08:00
|
|
|
prev=framework
|
2003-09-10 16:40:42 +08:00
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# Some other compiler flag.
|
|
|
|
-* | +*)
|
|
|
|
# Unknown arguments in both finalize_command and compile_command need
|
|
|
|
# to be aesthetically quoted because they are evaled later.
|
|
|
|
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
|
2001-03-06 04:08:09 +08:00
|
|
|
case $arg in
|
1999-12-18 15:50:04 +08:00
|
|
|
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
1999-10-30 18:39:28 +08:00
|
|
|
arg="\"$arg\""
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
|
2001-05-28 07:20:45 +08:00
|
|
|
*.$objext)
|
|
|
|
# A standard object.
|
|
|
|
objs="$objs $arg"
|
|
|
|
;;
|
|
|
|
|
|
|
|
*.lo)
|
|
|
|
# A libtool-controlled object.
|
|
|
|
|
|
|
|
# Check to see that this really is a libtool object.
|
2004-01-22 23:27:25 +08:00
|
|
|
if (${SED} -e '2q' $arg | $GREP "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
2001-09-03 06:07:38 +08:00
|
|
|
pic_object=
|
|
|
|
non_pic_object=
|
|
|
|
|
|
|
|
# Read the .lo file
|
|
|
|
# If there is no directory component, then add one.
|
|
|
|
case $arg in
|
|
|
|
*/* | *\\*) . $arg ;;
|
|
|
|
*) . ./$arg ;;
|
|
|
|
esac
|
|
|
|
|
2004-02-13 07:47:46 +08:00
|
|
|
if test -z "$pic_object" ||
|
2001-09-03 06:07:38 +08:00
|
|
|
test -z "$non_pic_object" ||
|
2004-02-13 07:47:46 +08:00
|
|
|
test "$pic_object" = none &&
|
2001-09-03 06:07:38 +08:00
|
|
|
test "$non_pic_object" = none; then
|
|
|
|
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2001-09-03 06:07:38 +08:00
|
|
|
fi
|
2001-05-28 07:20:45 +08:00
|
|
|
|
|
|
|
# Extract subdirectory from the argument.
|
|
|
|
xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
|
|
|
|
if test "X$xdir" = "X$arg"; then
|
|
|
|
xdir=
|
|
|
|
else
|
|
|
|
xdir="$xdir/"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
2001-09-03 06:07:38 +08:00
|
|
|
if test "$pic_object" != none; then
|
|
|
|
# Prepend the subdirectory the object is found in.
|
2001-05-28 07:20:45 +08:00
|
|
|
pic_object="$xdir$pic_object"
|
|
|
|
|
|
|
|
if test "$prev" = dlfiles; then
|
|
|
|
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
|
2001-09-03 06:07:38 +08:00
|
|
|
dlfiles="$dlfiles $pic_object"
|
|
|
|
prev=
|
|
|
|
continue
|
2001-05-28 07:20:45 +08:00
|
|
|
else
|
2001-09-03 06:07:38 +08:00
|
|
|
# If libtool objects are unsupported, then we need to preload.
|
|
|
|
prev=dlprefiles
|
2001-05-28 07:20:45 +08:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
# CHECK ME: I think I busted this. -Ossama
|
2001-09-03 06:07:38 +08:00
|
|
|
if test "$prev" = dlprefiles; then
|
2001-05-28 07:20:45 +08:00
|
|
|
# Preload the old-style object.
|
|
|
|
dlprefiles="$dlprefiles $pic_object"
|
|
|
|
prev=
|
2001-09-03 06:07:38 +08:00
|
|
|
fi
|
2001-05-28 07:20:45 +08:00
|
|
|
|
2001-09-03 06:07:38 +08:00
|
|
|
# A PIC object.
|
2001-05-28 07:20:45 +08:00
|
|
|
libobjs="$libobjs $pic_object"
|
|
|
|
arg="$pic_object"
|
2001-09-03 06:07:38 +08:00
|
|
|
fi
|
2001-05-28 07:20:45 +08:00
|
|
|
|
2001-09-03 06:07:38 +08:00
|
|
|
# Non-PIC object.
|
|
|
|
if test "$non_pic_object" != none; then
|
|
|
|
# Prepend the subdirectory the object is found in.
|
2001-05-28 07:20:45 +08:00
|
|
|
non_pic_object="$xdir$non_pic_object"
|
|
|
|
|
2001-09-03 06:07:38 +08:00
|
|
|
# A standard non-PIC object
|
|
|
|
non_pic_objects="$non_pic_objects $non_pic_object"
|
|
|
|
if test -z "$pic_object" || test "$pic_object" = none ; then
|
|
|
|
arg="$non_pic_object"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
# Only an error if not doing a dry-run.
|
|
|
|
if test -z "$run"; then
|
|
|
|
$echo "$modename: \`$arg' is not a valid libtool object" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2001-09-03 06:07:38 +08:00
|
|
|
else
|
|
|
|
# Dry-run case.
|
2001-05-28 07:20:45 +08:00
|
|
|
|
|
|
|
# Extract subdirectory from the argument.
|
|
|
|
xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
|
|
|
|
if test "X$xdir" = "X$arg"; then
|
|
|
|
xdir=
|
|
|
|
else
|
|
|
|
xdir="$xdir/"
|
|
|
|
fi
|
|
|
|
|
2001-09-03 06:07:38 +08:00
|
|
|
pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
|
|
|
|
non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
|
2001-05-28 07:20:45 +08:00
|
|
|
libobjs="$libobjs $pic_object"
|
2001-09-03 06:07:38 +08:00
|
|
|
non_pic_objects="$non_pic_objects $non_pic_object"
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
;;
|
|
|
|
|
2000-02-02 00:43:34 +08:00
|
|
|
*.$libext)
|
1999-10-30 18:39:28 +08:00
|
|
|
# An archive.
|
|
|
|
deplibs="$deplibs $arg"
|
|
|
|
old_deplibs="$old_deplibs $arg"
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
*.la)
|
|
|
|
# A libtool-controlled library.
|
|
|
|
|
|
|
|
if test "$prev" = dlfiles; then
|
2000-02-02 00:43:34 +08:00
|
|
|
# This library was specified with -dlopen.
|
1999-10-30 18:39:28 +08:00
|
|
|
dlfiles="$dlfiles $arg"
|
|
|
|
prev=
|
2000-02-02 00:43:34 +08:00
|
|
|
elif test "$prev" = dlprefiles; then
|
|
|
|
# The library was specified with -dlpreopen.
|
|
|
|
dlprefiles="$dlprefiles $arg"
|
|
|
|
prev=
|
|
|
|
else
|
|
|
|
deplibs="$deplibs $arg"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
|
|
|
|
# Some other compiler argument.
|
|
|
|
*)
|
|
|
|
# Unknown arguments in both finalize_command and compile_command need
|
|
|
|
# to be aesthetically quoted because they are evaled later.
|
|
|
|
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
|
2001-03-06 04:08:09 +08:00
|
|
|
case $arg in
|
1999-12-18 15:50:04 +08:00
|
|
|
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
1999-10-30 18:39:28 +08:00
|
|
|
arg="\"$arg\""
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
;;
|
2001-04-25 04:30:21 +08:00
|
|
|
esac # arg
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
# Now actually substitute the argument into the commands.
|
|
|
|
if test -n "$arg"; then
|
|
|
|
compile_command="$compile_command $arg"
|
|
|
|
finalize_command="$finalize_command $arg"
|
|
|
|
fi
|
2001-04-25 04:30:21 +08:00
|
|
|
done # argument parsing loop
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
if test -n "$prev"; then
|
|
|
|
$echo "$modename: the \`$prevarg' option requires an argument" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
|
|
|
|
eval arg=\"$export_dynamic_flag_spec\"
|
|
|
|
compile_command="$compile_command $arg"
|
|
|
|
finalize_command="$finalize_command $arg"
|
|
|
|
fi
|
|
|
|
|
2001-05-28 07:20:45 +08:00
|
|
|
oldlibs=
|
1999-10-30 18:39:28 +08:00
|
|
|
# calculate the name of the file, without its directory
|
|
|
|
outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
|
|
|
|
libobjs_save="$libobjs"
|
|
|
|
|
|
|
|
if test -n "$shlibpath_var"; then
|
|
|
|
# get the directories listed in $shlibpath_var
|
2000-05-29 18:42:50 +08:00
|
|
|
eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
|
|
|
shlib_search_path=
|
|
|
|
fi
|
|
|
|
eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
|
|
|
|
eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
|
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
|
|
|
|
if test "X$output_objdir" = "X$output"; then
|
|
|
|
output_objdir="$objdir"
|
|
|
|
else
|
|
|
|
output_objdir="$output_objdir/$objdir"
|
|
|
|
fi
|
|
|
|
# Create the object directory.
|
2001-07-30 00:20:45 +08:00
|
|
|
if test ! -d "$output_objdir"; then
|
2000-01-20 04:34:37 +08:00
|
|
|
$show "$mkdir $output_objdir"
|
|
|
|
$run $mkdir $output_objdir
|
|
|
|
status=$?
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$status" -ne 0 && test ! -d "$output_objdir"; then
|
2000-01-20 04:34:37 +08:00
|
|
|
exit $status
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2000-05-03 21:26:03 +08:00
|
|
|
# Determine the type of output
|
2001-03-06 04:08:09 +08:00
|
|
|
case $output in
|
1999-10-30 18:39:28 +08:00
|
|
|
"")
|
|
|
|
$echo "$modename: you must specify an output file" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
2000-05-03 21:26:03 +08:00
|
|
|
*.$libext) linkmode=oldlib ;;
|
|
|
|
*.lo | *.$objext) linkmode=obj ;;
|
|
|
|
*.la) linkmode=lib ;;
|
|
|
|
*) linkmode=prog ;; # Anything else should be a program.
|
1999-10-30 18:39:28 +08:00
|
|
|
esac
|
2000-01-25 04:34:46 +08:00
|
|
|
|
2002-03-03 11:19:55 +08:00
|
|
|
case $host in
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
*cygwin* | *mingw* | *pw32*)
|
2004-02-13 07:47:46 +08:00
|
|
|
# don't eliminate duplications in $postdeps and $predeps
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
duplicate_compiler_generated_deps=yes
|
2002-03-03 11:19:55 +08:00
|
|
|
;;
|
|
|
|
*)
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
duplicate_compiler_generated_deps=$duplicate_deps
|
2002-03-03 11:19:55 +08:00
|
|
|
;;
|
|
|
|
esac
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
specialdeplibs=
|
2002-03-03 11:19:55 +08:00
|
|
|
|
2000-02-24 07:10:05 +08:00
|
|
|
libs=
|
2000-05-03 21:26:03 +08:00
|
|
|
# Find all interdependent deplibs by searching for libraries
|
|
|
|
# that are linked more than once (e.g. -la -lb -la)
|
2000-02-24 07:10:05 +08:00
|
|
|
for deplib in $deplibs; do
|
2001-11-28 03:31:22 +08:00
|
|
|
if test "X$duplicate_deps" = "Xyes" ; then
|
|
|
|
case "$libs " in
|
|
|
|
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
|
|
|
esac
|
|
|
|
fi
|
2000-02-24 07:10:05 +08:00
|
|
|
libs="$libs $deplib"
|
|
|
|
done
|
2001-05-28 07:20:45 +08:00
|
|
|
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$linkmode" = lib; then
|
2001-05-28 07:20:45 +08:00
|
|
|
libs="$predeps $libs $compiler_lib_search_path $postdeps"
|
|
|
|
|
|
|
|
# Compute libraries that are listed more than once in $predeps
|
|
|
|
# $postdeps and mark them as special (i.e., whose duplicates are
|
|
|
|
# not to be eliminated).
|
|
|
|
pre_post_deps=
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
|
2001-11-28 03:31:22 +08:00
|
|
|
for pre_post_dep in $predeps $postdeps; do
|
|
|
|
case "$pre_post_deps " in
|
|
|
|
*" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
|
|
|
|
esac
|
|
|
|
pre_post_deps="$pre_post_deps $pre_post_dep"
|
|
|
|
done
|
|
|
|
fi
|
2001-05-28 07:20:45 +08:00
|
|
|
pre_post_deps=
|
|
|
|
fi
|
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
deplibs=
|
|
|
|
newdependency_libs=
|
2000-05-03 21:26:03 +08:00
|
|
|
newlib_search_path=
|
2000-01-20 04:34:37 +08:00
|
|
|
need_relink=no # whether we're linking any uninstalled libtool libraries
|
2001-04-25 04:30:21 +08:00
|
|
|
notinst_deplibs= # not-installed libtool libraries
|
|
|
|
notinst_path= # paths that contain not-installed libtool libraries
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
case $linkmode in
|
2000-01-25 04:34:46 +08:00
|
|
|
lib)
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
passes="conv dlpreopen link"
|
2000-02-02 00:43:34 +08:00
|
|
|
for file in $dlfiles $dlprefiles; do
|
2001-03-06 04:08:09 +08:00
|
|
|
case $file in
|
2000-02-02 00:43:34 +08:00
|
|
|
*.la) ;;
|
|
|
|
*)
|
2000-05-03 21:26:03 +08:00
|
|
|
$echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2000-02-02 00:43:34 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
2000-01-20 04:34:37 +08:00
|
|
|
;;
|
2000-01-25 04:34:46 +08:00
|
|
|
prog)
|
2000-02-24 07:10:05 +08:00
|
|
|
compile_deplibs=
|
|
|
|
finalize_deplibs=
|
2000-01-20 04:34:37 +08:00
|
|
|
alldeplibs=no
|
2000-02-02 00:43:34 +08:00
|
|
|
newdlfiles=
|
|
|
|
newdlprefiles=
|
2000-03-27 07:01:20 +08:00
|
|
|
passes="conv scan dlopen dlpreopen link"
|
2000-01-20 04:34:37 +08:00
|
|
|
;;
|
2001-04-25 04:30:21 +08:00
|
|
|
*) passes="conv"
|
2000-01-20 04:34:37 +08:00
|
|
|
;;
|
|
|
|
esac
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
for pass in $passes; do
|
2001-05-28 07:20:45 +08:00
|
|
|
if test "$linkmode,$pass" = "lib,link" ||
|
|
|
|
test "$linkmode,$pass" = "prog,scan"; then
|
|
|
|
libs="$deplibs"
|
|
|
|
deplibs=
|
|
|
|
fi
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$linkmode" = prog; then
|
2000-02-02 00:43:34 +08:00
|
|
|
case $pass in
|
2001-05-28 07:20:45 +08:00
|
|
|
dlopen) libs="$dlfiles" ;;
|
2000-02-02 00:43:34 +08:00
|
|
|
dlpreopen) libs="$dlprefiles" ;;
|
2004-06-21 22:52:57 +08:00
|
|
|
link) libs="$deplibs %DEPLIBS% $dependency_libs $inherited_linker_flags" ;;
|
2000-02-02 00:43:34 +08:00
|
|
|
esac
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
if test "$linkmode,$pass" = "lib,dlpreopen"; then
|
2004-08-26 17:02:42 +08:00
|
|
|
# Collect and forward deplibs of preopened libtool libs
|
2004-07-26 04:36:43 +08:00
|
|
|
for lib in $dlprefiles; do
|
|
|
|
# Ignore non-libtool-libs
|
|
|
|
case $lib in
|
|
|
|
*/*.la | *\\*.la)
|
|
|
|
. $lib
|
|
|
|
deplibs="$deplibs $dependency_libs"
|
|
|
|
;;
|
|
|
|
*.la)
|
|
|
|
. ./$lib
|
|
|
|
deplibs="$deplibs $dependency_libs"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
libs="$dlprefiles"
|
|
|
|
fi
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$pass" = dlopen; then
|
2001-05-28 07:20:45 +08:00
|
|
|
# Collect dlpreopened libraries
|
|
|
|
save_deplibs="$deplibs"
|
|
|
|
deplibs=
|
|
|
|
fi
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
|
2000-02-02 00:43:34 +08:00
|
|
|
for deplib in $libs; do
|
2000-01-20 04:34:37 +08:00
|
|
|
lib=
|
|
|
|
found=no
|
2001-03-06 04:08:09 +08:00
|
|
|
case $deplib in
|
2003-11-11 05:06:49 +08:00
|
|
|
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
|
|
|
if test "$linkmode,$pass" = "prog,link"; then
|
|
|
|
compile_deplibs="$deplib $compile_deplibs"
|
|
|
|
finalize_deplibs="$deplib $finalize_deplibs"
|
|
|
|
else
|
|
|
|
deplibs="$deplib $deplibs"
|
|
|
|
fi
|
|
|
|
continue
|
|
|
|
;;
|
2000-01-20 04:34:37 +08:00
|
|
|
-l*)
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$linkmode" != lib && test "$linkmode" != prog; then
|
2001-05-28 07:20:45 +08:00
|
|
|
$echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
|
2000-01-20 04:34:37 +08:00
|
|
|
continue
|
|
|
|
fi
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$pass" = conv; then
|
2000-05-03 21:26:03 +08:00
|
|
|
deplibs="$deplib $deplibs"
|
|
|
|
continue
|
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
|
2000-05-03 21:26:03 +08:00
|
|
|
for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
|
2004-02-15 21:30:01 +08:00
|
|
|
for search_ext in .la $std_shrext .so .a; do
|
2003-06-04 02:20:37 +08:00
|
|
|
# Search the libtool library
|
|
|
|
lib="$searchdir/lib${name}${search_ext}"
|
|
|
|
if test -f "$lib"; then
|
|
|
|
if test "$search_ext" = ".la"; then
|
|
|
|
found=yes
|
|
|
|
else
|
|
|
|
found=no
|
|
|
|
fi
|
|
|
|
break 2
|
|
|
|
fi
|
|
|
|
done
|
2000-01-20 04:34:37 +08:00
|
|
|
done
|
|
|
|
if test "$found" != yes; then
|
2001-04-25 04:30:21 +08:00
|
|
|
# deplib doesn't seem to be a libtool library
|
2000-01-20 04:34:37 +08:00
|
|
|
if test "$linkmode,$pass" = "prog,link"; then
|
2000-02-24 07:10:05 +08:00
|
|
|
compile_deplibs="$deplib $compile_deplibs"
|
|
|
|
finalize_deplibs="$deplib $finalize_deplibs"
|
2000-01-20 04:34:37 +08:00
|
|
|
else
|
2000-02-24 07:10:05 +08:00
|
|
|
deplibs="$deplib $deplibs"
|
2001-07-30 00:20:45 +08:00
|
|
|
test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
|
|
|
continue
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
else # deplib is a libtool library
|
|
|
|
# If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
|
|
|
|
# We need to do some special things here, and not later.
|
|
|
|
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
|
|
|
case " $predeps $postdeps " in
|
|
|
|
*" $deplib "*)
|
Don't assume that egrep and fgrep exist. POSIX 1003.1-2001 no
longer requires them; you're supposed to use grep -E and grep -F
instead. Also, don't assume that "test -a" works, since POSIX
doesn't require it.
* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER, _LT_AC_LANG_C_CONFIG,
_LT_AC_LANG_CXX_CONFIG, AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE,
AC_LIBTOOL_PROG_LD_SHLIBS):
egrep -> grep, when that makes no difference.
* libtoolize.in: Likewise.
* ltdl.m4 (AC_LTDL_SYMBOL_USCORE): Likewise.
* ltmain.in: Likewise.
* demo/Makefile.am (hc-direct): Likewise.
* pdemo/Makefile.am (hc-direct): Likewise.
* tests/build-relink.test, tests/build-relink2.test,
tests/cdemo-conf.test, tests/cdemo-shared.test,
tests/cdemo-static.test, tests/demo-conf.test,
tests/demo-nofast.test, tests/demo-shared.test,
tests/demo-static.test, tests/depdemo-conf.test,
tests/depdemo-nofast.test, tests/depdemo-shared.test,
tests/depdemo-static.test, tests/hardcode.test,
tests/mdemo-conf.test, tests/mdemo-shared.test,
tests/mdemo-static.test, tests/pdemo-conf.test,
tests/tagdemo-conf.test, tests/tagdemo-shared.test,
tests/tagdemo-static.test: Likewise.
* libtool.m4 (AC_PROG_EGREP):
New macro, defined if Autoconf doesn't define.
(AC_PATH_TOOL_PREFIX, AC_PROG_LD_GNU): Use it.
(AC_PROG_LD, AC_PROG_NM, AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE):
Use shell pattern matching rather than egrep.
(AC_LIBTOOL_CONFIG): Set lt_EGREP and EGREP.
* demo/Makefile.am (SET_HARDCODE_FLAGS): Use sed instead of egrep.
* pdemo/Makefile.am (SET_HARDCODE_FLAGS): Likewise.
* tests/defs (EGREP, FGREP): New vars.
* ltmain.in: egrep -> $EGREP
* tests/assign.test, tests/demo-exec.test, tests/demo-inst.test,
tests/pdemo-exec.test, tests/pdemo-inst.test, tests/sh.test:
Likewise.
* tests/hardcode.test: fgrep -> $FGREP
* tests/f77demo-exec.test: test -a -> test &&
2002-11-19 17:42:39 +08:00
|
|
|
if (${SED} -e '2q' $lib |
|
2004-08-26 17:02:42 +08:00
|
|
|
$GREP "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
library_names=
|
|
|
|
old_library=
|
|
|
|
case $lib in
|
|
|
|
*/* | *\\*) . $lib ;;
|
|
|
|
*) . ./$lib ;;
|
|
|
|
esac
|
|
|
|
for l in $old_library $library_names; do
|
|
|
|
ll="$l"
|
|
|
|
done
|
|
|
|
if test "X$ll" = "X$old_library" ; then # only static version available
|
|
|
|
found=no
|
|
|
|
ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
|
|
|
|
test "X$ladir" = "X$lib" && ladir="."
|
|
|
|
lib=$ladir/$old_library
|
|
|
|
if test "$linkmode,$pass" = "prog,link"; then
|
|
|
|
compile_deplibs="$deplib $compile_deplibs"
|
|
|
|
finalize_deplibs="$deplib $finalize_deplibs"
|
|
|
|
else
|
|
|
|
deplibs="$deplib $deplibs"
|
|
|
|
test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
|
|
|
|
fi
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
fi
|
2004-08-26 17:02:42 +08:00
|
|
|
;;
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
*) ;;
|
|
|
|
esac
|
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
2001-04-25 04:30:21 +08:00
|
|
|
;; # -l
|
2004-01-19 12:57:26 +08:00
|
|
|
*.ltframework)
|
2003-09-10 16:40:42 +08:00
|
|
|
if test "$linkmode,$pass" = "prog,link"; then
|
|
|
|
compile_deplibs="$deplib $compile_deplibs"
|
|
|
|
finalize_deplibs="$deplib $finalize_deplibs"
|
|
|
|
else
|
|
|
|
deplibs="$deplib $deplibs"
|
|
|
|
if test "$linkmode" = lib ; then
|
2004-06-21 22:52:57 +08:00
|
|
|
case "$inherited_linker_flags " in
|
|
|
|
*" $deplib "*) ;;
|
|
|
|
* ) inherited_linker_flags="$inherited_linker_flags $deplib" ;;
|
2004-08-26 17:02:42 +08:00
|
|
|
esac
|
2003-09-10 16:40:42 +08:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
continue
|
|
|
|
;;
|
2000-01-20 04:34:37 +08:00
|
|
|
-L*)
|
|
|
|
case $linkmode in
|
|
|
|
lib)
|
2000-02-24 07:10:05 +08:00
|
|
|
deplibs="$deplib $deplibs"
|
2001-07-30 00:20:45 +08:00
|
|
|
test "$pass" = conv && continue
|
2000-02-24 07:10:05 +08:00
|
|
|
newdependency_libs="$deplib $newdependency_libs"
|
2000-05-03 21:26:03 +08:00
|
|
|
newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
|
2000-01-20 04:34:37 +08:00
|
|
|
;;
|
|
|
|
prog)
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$pass" = conv; then
|
2000-05-03 21:26:03 +08:00
|
|
|
deplibs="$deplib $deplibs"
|
|
|
|
continue
|
|
|
|
fi
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$pass" = scan; then
|
2000-02-24 07:10:05 +08:00
|
|
|
deplibs="$deplib $deplibs"
|
2000-01-20 04:34:37 +08:00
|
|
|
else
|
2000-02-24 07:10:05 +08:00
|
|
|
compile_deplibs="$deplib $compile_deplibs"
|
|
|
|
finalize_deplibs="$deplib $finalize_deplibs"
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
2004-03-24 10:35:33 +08:00
|
|
|
newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
|
2000-01-20 04:34:37 +08:00
|
|
|
;;
|
2000-01-25 04:34:46 +08:00
|
|
|
*)
|
2001-05-28 07:20:45 +08:00
|
|
|
$echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
|
2000-01-20 04:34:37 +08:00
|
|
|
;;
|
2001-04-25 04:30:21 +08:00
|
|
|
esac # linkmode
|
2000-01-20 04:34:37 +08:00
|
|
|
continue
|
2001-04-25 04:30:21 +08:00
|
|
|
;; # -L
|
2000-01-20 04:34:37 +08:00
|
|
|
-R*)
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$pass" = link; then
|
2000-01-20 04:34:37 +08:00
|
|
|
dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
|
|
|
|
# Make sure the xrpath contains only unique directories.
|
|
|
|
case "$xrpath " in
|
|
|
|
*" $dir "*) ;;
|
|
|
|
*) xrpath="$xrpath $dir" ;;
|
|
|
|
esac
|
|
|
|
fi
|
2000-05-03 21:26:03 +08:00
|
|
|
deplibs="$deplib $deplibs"
|
2000-02-24 07:10:05 +08:00
|
|
|
continue
|
2000-01-20 04:34:37 +08:00
|
|
|
;;
|
2000-01-28 04:33:40 +08:00
|
|
|
*.la) lib="$deplib" ;;
|
2000-02-02 00:43:34 +08:00
|
|
|
*.$libext)
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$pass" = conv; then
|
2000-05-03 21:26:03 +08:00
|
|
|
deplibs="$deplib $deplibs"
|
|
|
|
continue
|
|
|
|
fi
|
2000-01-28 04:33:40 +08:00
|
|
|
case $linkmode in
|
|
|
|
lib)
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
# Linking convenience modules into shared libraries is allowed,
|
|
|
|
# but linking other static libraries is non-portable.
|
|
|
|
case " $dlpreconveniencelibs " in
|
|
|
|
*" $lib "*) ;;
|
|
|
|
*)
|
2004-08-03 22:54:34 +08:00
|
|
|
valid_a_lib=no
|
|
|
|
case $deplibs_check_method in
|
|
|
|
match_pattern*)
|
|
|
|
set dummy $deplibs_check_method
|
|
|
|
match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
|
|
|
|
if eval $echo \"$deplib\" 2>/dev/null \
|
|
|
|
| $SED 10q \
|
|
|
|
| $EGREP "$match_pattern_regex" > /dev/null; then
|
|
|
|
valid_a_lib=yes
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
pass_all)
|
|
|
|
valid_a_lib=yes
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
if test "$valid_a_lib" != yes; then
|
2004-08-26 17:02:42 +08:00
|
|
|
$echo
|
|
|
|
$echo "*** Warning: Trying to link with static lib archive $deplib."
|
|
|
|
$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"
|
|
|
|
$echo "*** because the file extensions .$libext of this argument makes me believe"
|
|
|
|
$echo "*** that it is just a static archive that I should not use here."
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
else
|
2004-08-26 17:02:42 +08:00
|
|
|
$echo
|
|
|
|
$echo "*** Warning: Linking the shared library $output against the"
|
|
|
|
$echo "*** static library $deplib is not portable!"
|
|
|
|
deplibs="$deplib $deplibs"
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
2000-01-20 04:34:37 +08:00
|
|
|
continue
|
2000-01-28 04:33:40 +08:00
|
|
|
;;
|
|
|
|
prog)
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$pass" != link; then
|
2000-02-24 07:10:05 +08:00
|
|
|
deplibs="$deplib $deplibs"
|
2000-01-28 04:33:40 +08:00
|
|
|
else
|
2000-02-24 07:10:05 +08:00
|
|
|
compile_deplibs="$deplib $compile_deplibs"
|
|
|
|
finalize_deplibs="$deplib $finalize_deplibs"
|
2000-01-28 04:33:40 +08:00
|
|
|
fi
|
|
|
|
continue
|
|
|
|
;;
|
2001-04-25 04:30:21 +08:00
|
|
|
esac # linkmode
|
|
|
|
;; # *.$libext
|
2000-02-24 07:10:05 +08:00
|
|
|
*.lo | *.$objext)
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$pass" = conv; then
|
2001-05-28 07:20:45 +08:00
|
|
|
deplibs="$deplib $deplibs"
|
2001-07-30 00:20:45 +08:00
|
|
|
elif test "$linkmode" = prog; then
|
|
|
|
if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
|
2001-05-28 07:20:45 +08:00
|
|
|
# If there is no dlopen support or we're linking statically,
|
|
|
|
# we need to preload.
|
|
|
|
newdlprefiles="$newdlprefiles $deplib"
|
|
|
|
compile_deplibs="$deplib $compile_deplibs"
|
|
|
|
finalize_deplibs="$deplib $finalize_deplibs"
|
|
|
|
else
|
|
|
|
newdlfiles="$newdlfiles $deplib"
|
|
|
|
fi
|
2000-02-24 07:10:05 +08:00
|
|
|
fi
|
|
|
|
continue
|
|
|
|
;;
|
2000-01-20 04:34:37 +08:00
|
|
|
%DEPLIBS%)
|
|
|
|
alldeplibs=yes
|
1999-10-30 18:39:28 +08:00
|
|
|
continue
|
|
|
|
;;
|
2001-04-25 04:30:21 +08:00
|
|
|
esac # case $deplib
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$found" = yes || test -f "$lib"; then :
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
2000-01-20 04:34:37 +08:00
|
|
|
$echo "$modename: cannot find the library \`$lib'" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Check to see that this really is a libtool archive.
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
if (${SED} -e '2q' $lib | $GREP "^# Generated by ltmain.sh ") >/dev/null 2>&1; then :
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
2000-01-20 04:34:37 +08:00
|
|
|
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
|
|
|
|
test "X$ladir" = "X$lib" && ladir="."
|
|
|
|
|
2000-02-02 00:43:34 +08:00
|
|
|
dlname=
|
|
|
|
dlopen=
|
|
|
|
dlpreopen=
|
2000-01-20 04:34:37 +08:00
|
|
|
libdir=
|
|
|
|
library_names=
|
|
|
|
old_library=
|
2004-06-21 22:52:57 +08:00
|
|
|
inherited_linker_flags=
|
2000-01-20 04:34:37 +08:00
|
|
|
# If the library was installed with an old release of libtool,
|
2003-03-21 04:24:21 +08:00
|
|
|
# it will not redefine variables installed, or shouldnotlink
|
2000-01-20 04:34:37 +08:00
|
|
|
installed=yes
|
2003-03-21 04:24:21 +08:00
|
|
|
shouldnotlink=no
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
# Read the .la file
|
2001-03-06 04:08:09 +08:00
|
|
|
case $lib in
|
2000-01-20 04:34:37 +08:00
|
|
|
*/* | *\\*) . $lib ;;
|
|
|
|
*) . ./$lib ;;
|
1999-10-30 18:39:28 +08:00
|
|
|
esac
|
|
|
|
|
2003-09-10 16:40:42 +08:00
|
|
|
case $host in
|
|
|
|
*-*-darwin*)
|
2004-06-21 22:52:57 +08:00
|
|
|
# Convert "-framework foo" to "foo.ltframework"
|
|
|
|
if test -n "$inherited_linker_flags"; then
|
|
|
|
inherited_linker_flags=`$echo "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
|
|
|
|
fi
|
|
|
|
dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
|
2003-09-10 16:40:42 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2000-03-27 07:01:20 +08:00
|
|
|
if test "$linkmode,$pass" = "lib,link" ||
|
|
|
|
test "$linkmode,$pass" = "prog,scan" ||
|
2001-07-30 00:20:45 +08:00
|
|
|
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
|
2000-02-02 00:43:34 +08:00
|
|
|
test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
|
|
|
|
test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
|
|
|
|
fi
|
|
|
|
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$pass" = conv; then
|
2001-04-25 04:30:21 +08:00
|
|
|
# Only check for convenience libraries
|
2000-05-03 21:26:03 +08:00
|
|
|
deplibs="$lib $deplibs"
|
2000-03-27 07:01:20 +08:00
|
|
|
if test -z "$libdir"; then
|
|
|
|
if test -z "$old_library"; then
|
|
|
|
$echo "$modename: cannot find name of link library for \`$lib'" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2000-03-27 07:01:20 +08:00
|
|
|
fi
|
|
|
|
# It is a libtool convenience library, so add in its objects.
|
|
|
|
convenience="$convenience $ladir/$objdir/$old_library"
|
|
|
|
old_convenience="$old_convenience $ladir/$objdir/$old_library"
|
2000-05-03 21:26:03 +08:00
|
|
|
tmp_libs=
|
|
|
|
for deplib in $dependency_libs; do
|
|
|
|
deplibs="$deplib $deplibs"
|
2004-08-26 17:02:42 +08:00
|
|
|
if test "X$duplicate_deps" = "Xyes" ; then
|
|
|
|
case "$tmp_libs " in
|
|
|
|
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
|
|
|
esac
|
|
|
|
fi
|
2000-05-03 21:26:03 +08:00
|
|
|
tmp_libs="$tmp_libs $deplib"
|
|
|
|
done
|
2001-07-30 00:20:45 +08:00
|
|
|
elif test "$linkmode" != prog && test "$linkmode" != lib; then
|
2000-01-20 04:34:37 +08:00
|
|
|
$echo "$modename: \`$lib' is not a convenience library" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
|
|
|
continue
|
2001-04-25 04:30:21 +08:00
|
|
|
fi # $pass = conv
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2003-09-10 16:40:42 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Get the name of the library we link against.
|
|
|
|
linklib=
|
|
|
|
for l in $old_library $library_names; do
|
|
|
|
linklib="$l"
|
|
|
|
done
|
|
|
|
if test -z "$linklib"; then
|
|
|
|
$echo "$modename: cannot find name of link library for \`$lib'" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
2000-02-02 00:43:34 +08:00
|
|
|
# This library was specified with -dlopen.
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$pass" = dlopen; then
|
2000-05-03 21:26:03 +08:00
|
|
|
if test -z "$libdir"; then
|
|
|
|
$echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2000-05-03 21:26:03 +08:00
|
|
|
fi
|
2004-02-13 07:47:46 +08:00
|
|
|
if test -z "$dlname" ||
|
|
|
|
test "$dlopen_support" != yes ||
|
|
|
|
test "$build_libtool_libs" = no; then
|
2000-12-21 06:40:59 +08:00
|
|
|
# If there is no dlname, no dlopen support or we're linking
|
2001-05-28 07:20:45 +08:00
|
|
|
# statically, we need to preload. We also need to preload any
|
|
|
|
# dependent libraries so libltdl's deplib preloader doesn't
|
|
|
|
# bomb out in the load deplibs phase.
|
|
|
|
dlprefiles="$dlprefiles $lib $dependency_libs"
|
2000-01-28 04:33:40 +08:00
|
|
|
else
|
2000-02-02 00:43:34 +08:00
|
|
|
newdlfiles="$newdlfiles $lib"
|
2000-01-28 04:33:40 +08:00
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
continue
|
2001-04-25 04:30:21 +08:00
|
|
|
fi # $pass = dlopen
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# We need an absolute path.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $ladir in
|
2000-01-20 04:34:37 +08:00
|
|
|
[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
|
|
|
|
*)
|
|
|
|
abs_ladir=`cd "$ladir" && pwd`
|
|
|
|
if test -z "$abs_ladir"; then
|
|
|
|
$echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
|
|
|
|
$echo "$modename: passing it literally to the linker, although it might fail" 1>&2
|
|
|
|
abs_ladir="$ladir"
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
|
2000-01-25 04:34:46 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Find the relevant object directory and library name.
|
|
|
|
if test "X$installed" = Xyes; then
|
|
|
|
if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
|
|
|
|
$echo "$modename: warning: library \`$lib' was moved." 1>&2
|
|
|
|
dir="$ladir"
|
|
|
|
absdir="$abs_ladir"
|
|
|
|
libdir="$abs_ladir"
|
|
|
|
else
|
|
|
|
dir="$libdir"
|
|
|
|
absdir="$libdir"
|
|
|
|
fi
|
|
|
|
else
|
2003-09-10 16:40:42 +08:00
|
|
|
if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
|
|
|
|
dir="$ladir"
|
|
|
|
absdir="$abs_ladir"
|
|
|
|
# Remove this search path later
|
|
|
|
notinst_path="$notinst_path $abs_ladir"
|
|
|
|
else
|
|
|
|
dir="$ladir/$objdir"
|
|
|
|
absdir="$abs_ladir/$objdir"
|
|
|
|
# Remove this search path later
|
|
|
|
notinst_path="$notinst_path $abs_ladir"
|
|
|
|
fi
|
2001-04-25 04:30:21 +08:00
|
|
|
fi # $installed = yes
|
2000-01-20 04:34:37 +08:00
|
|
|
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-02-02 00:43:34 +08:00
|
|
|
# This library was specified with -dlpreopen.
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$pass" = dlpreopen; then
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
if test -z "$libdir" && test "$linkmode" = prog; then
|
|
|
|
$echo "$modename: only libraries may -dlpreopen a convenience library: \`$lib'" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2000-05-03 21:26:03 +08:00
|
|
|
fi
|
2000-02-02 00:43:34 +08:00
|
|
|
# Prefer using a static library (so that no silly _DYNAMIC symbols
|
|
|
|
# are required to link).
|
|
|
|
if test -n "$old_library"; then
|
|
|
|
newdlprefiles="$newdlprefiles $dir/$old_library"
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
# Keep a list of preopened convenience libraries to check
|
|
|
|
# that they are being used correctly in the link pass.
|
|
|
|
test -z "$libdir" && \
|
|
|
|
dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
|
2000-09-04 09:18:13 +08:00
|
|
|
# Otherwise, use the dlname, so that lt_dlopen finds it.
|
|
|
|
elif test -n "$dlname"; then
|
|
|
|
newdlprefiles="$newdlprefiles $dir/$dlname"
|
2000-02-02 00:43:34 +08:00
|
|
|
else
|
|
|
|
newdlprefiles="$newdlprefiles $dir/$linklib"
|
|
|
|
fi
|
2001-04-25 04:30:21 +08:00
|
|
|
fi # $pass = dlpreopen
|
2000-02-02 00:43:34 +08:00
|
|
|
|
2000-05-03 21:26:03 +08:00
|
|
|
if test -z "$libdir"; then
|
2001-04-25 04:30:21 +08:00
|
|
|
# Link the convenience library
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$linkmode" = lib; then
|
2000-05-03 21:26:03 +08:00
|
|
|
deplibs="$dir/$old_library $deplibs"
|
|
|
|
elif test "$linkmode,$pass" = "prog,link"; then
|
|
|
|
compile_deplibs="$dir/$old_library $compile_deplibs"
|
|
|
|
finalize_deplibs="$dir/$old_library $finalize_deplibs"
|
|
|
|
else
|
2001-05-28 07:20:45 +08:00
|
|
|
deplibs="$lib $deplibs" # used for prog,scan pass
|
2000-05-03 21:26:03 +08:00
|
|
|
fi
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
|
2003-09-10 16:40:42 +08:00
|
|
|
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$linkmode" = prog && test "$pass" != link; then
|
2000-05-03 21:26:03 +08:00
|
|
|
newlib_search_path="$newlib_search_path $ladir"
|
2000-02-24 07:10:05 +08:00
|
|
|
deplibs="$lib $deplibs"
|
2000-02-02 00:43:34 +08:00
|
|
|
|
|
|
|
linkalldeplibs=no
|
2000-05-03 21:26:03 +08:00
|
|
|
if test "$link_all_deplibs" != no || test -z "$library_names" ||
|
|
|
|
test "$build_libtool_libs" = no; then
|
2000-02-02 00:43:34 +08:00
|
|
|
linkalldeplibs=yes
|
|
|
|
fi
|
|
|
|
|
2000-02-24 07:10:05 +08:00
|
|
|
tmp_libs=
|
2000-02-02 00:43:34 +08:00
|
|
|
for deplib in $dependency_libs; do
|
2001-03-06 04:08:09 +08:00
|
|
|
case $deplib in
|
2000-05-03 21:26:03 +08:00
|
|
|
-L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
|
2000-02-02 00:43:34 +08:00
|
|
|
esac
|
|
|
|
# Need to link against all dependency_libs?
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$linkalldeplibs" = yes; then
|
2000-02-24 07:10:05 +08:00
|
|
|
deplibs="$deplib $deplibs"
|
|
|
|
else
|
|
|
|
# Need to hardcode shared library paths
|
|
|
|
# or/and link against static libraries
|
|
|
|
newdependency_libs="$deplib $newdependency_libs"
|
|
|
|
fi
|
2001-11-28 03:31:22 +08:00
|
|
|
if test "X$duplicate_deps" = "Xyes" ; then
|
|
|
|
case "$tmp_libs " in
|
|
|
|
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
|
|
|
esac
|
|
|
|
fi
|
2000-02-24 07:10:05 +08:00
|
|
|
tmp_libs="$tmp_libs $deplib"
|
2001-04-25 04:30:21 +08:00
|
|
|
done # for deplib
|
2000-02-02 00:43:34 +08:00
|
|
|
continue
|
2001-04-25 04:30:21 +08:00
|
|
|
fi # $linkmode = prog...
|
2000-02-02 00:43:34 +08:00
|
|
|
|
2001-05-28 07:20:45 +08:00
|
|
|
if test "$linkmode,$pass" = "prog,link"; then
|
|
|
|
if test -n "$library_names" &&
|
|
|
|
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
|
|
|
# We need to hardcode the library path
|
|
|
|
if test -n "$shlibpath_var"; then
|
|
|
|
# Make sure the rpath contains only unique directories.
|
|
|
|
case "$temp_rpath " in
|
|
|
|
*" $dir "*) ;;
|
|
|
|
*" $absdir "*) ;;
|
|
|
|
*) temp_rpath="$temp_rpath $dir" ;;
|
|
|
|
esac
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Hardcode the library path.
|
|
|
|
# Skip directories that are in the system default run-time
|
|
|
|
# search path.
|
|
|
|
case " $sys_lib_dlsearch_path " in
|
|
|
|
*" $absdir "*) ;;
|
|
|
|
*)
|
|
|
|
case "$compile_rpath " in
|
|
|
|
*" $absdir "*) ;;
|
2000-01-25 04:34:46 +08:00
|
|
|
*) compile_rpath="$compile_rpath $absdir"
|
2000-01-20 04:34:37 +08:00
|
|
|
esac
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
case " $sys_lib_dlsearch_path " in
|
|
|
|
*" $libdir "*) ;;
|
|
|
|
*)
|
|
|
|
case "$finalize_rpath " in
|
|
|
|
*" $libdir "*) ;;
|
|
|
|
*) finalize_rpath="$finalize_rpath $libdir"
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
esac
|
2001-04-25 04:30:21 +08:00
|
|
|
fi # $linkmode,$pass = prog,link...
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test "$alldeplibs" = yes &&
|
|
|
|
{ test "$deplibs_check_method" = pass_all ||
|
|
|
|
{ test "$build_libtool_libs" = yes &&
|
|
|
|
test -n "$library_names"; }; }; then
|
2000-05-03 21:26:03 +08:00
|
|
|
# We only need to search for static libraries
|
2000-01-20 04:34:37 +08:00
|
|
|
continue
|
|
|
|
fi
|
2001-05-28 07:20:45 +08:00
|
|
|
fi
|
2001-09-03 06:07:38 +08:00
|
|
|
|
2001-05-28 07:20:45 +08:00
|
|
|
link_static=no # Whether the deplib will be linked statically
|
|
|
|
if test -n "$library_names" &&
|
|
|
|
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
2000-05-03 21:26:03 +08:00
|
|
|
if test "$installed" = no; then
|
2001-04-25 04:30:21 +08:00
|
|
|
notinst_deplibs="$notinst_deplibs $lib"
|
2000-05-03 21:26:03 +08:00
|
|
|
need_relink=yes
|
|
|
|
fi
|
2001-05-28 07:20:45 +08:00
|
|
|
# This is a shared library
|
2003-09-10 16:40:42 +08:00
|
|
|
|
2004-02-13 07:47:46 +08:00
|
|
|
# Warn about portability, can't link against -module's on some
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
# systems (darwin). Don't bleat about dlopened modules though!
|
|
|
|
dlopenmodule=""
|
2004-07-30 21:41:48 +08:00
|
|
|
for dlpremoduletest in $dlprefiles; do
|
|
|
|
if test "X$dlpremoduletest" = "X$lib"; then
|
|
|
|
dlopenmodule="$dlpremoduletest"
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
break
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo
|
|
|
|
if test "$linkmode" = prog; then
|
|
|
|
$echo "*** Warning: Linking the executable $output against the loadable module"
|
|
|
|
else
|
|
|
|
$echo "*** Warning: Linking the shared library $output against the loadable module"
|
|
|
|
fi
|
2003-09-10 16:40:42 +08:00
|
|
|
$echo "*** $linklib is not portable!"
|
2004-02-13 07:47:46 +08:00
|
|
|
fi
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$linkmode" = lib &&
|
|
|
|
test "$hardcode_into_libs" = yes; then
|
2001-05-28 07:20:45 +08:00
|
|
|
# Hardcode the library path.
|
|
|
|
# Skip directories that are in the system default run-time
|
|
|
|
# search path.
|
|
|
|
case " $sys_lib_dlsearch_path " in
|
|
|
|
*" $absdir "*) ;;
|
|
|
|
*)
|
|
|
|
case "$compile_rpath " in
|
|
|
|
*" $absdir "*) ;;
|
|
|
|
*) compile_rpath="$compile_rpath $absdir"
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
case " $sys_lib_dlsearch_path " in
|
|
|
|
*" $libdir "*) ;;
|
|
|
|
*)
|
|
|
|
case "$finalize_rpath " in
|
|
|
|
*" $libdir "*) ;;
|
|
|
|
*) finalize_rpath="$finalize_rpath $libdir"
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
2000-01-25 04:34:46 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test -n "$old_archive_from_expsyms_cmds"; then
|
|
|
|
# figure out the soname
|
|
|
|
set dummy $library_names
|
|
|
|
realname="$2"
|
|
|
|
shift; shift
|
2001-04-25 04:30:21 +08:00
|
|
|
libname=`eval \\$echo \"$libname_spec\"`
|
2001-03-31 08:08:03 +08:00
|
|
|
# use dlname if we got it. it's perfectly good, no?
|
|
|
|
if test -n "$dlname"; then
|
|
|
|
soname="$dlname"
|
|
|
|
elif test -n "$soname_spec"; then
|
|
|
|
# bleh windows
|
|
|
|
case $host in
|
2002-10-16 06:50:58 +08:00
|
|
|
*cygwin* | mingw*)
|
2001-03-31 08:08:03 +08:00
|
|
|
major=`expr $current - $age`
|
|
|
|
versuffix="-$major"
|
|
|
|
;;
|
|
|
|
esac
|
2000-01-20 04:34:37 +08:00
|
|
|
eval soname=\"$soname_spec\"
|
|
|
|
else
|
|
|
|
soname="$realname"
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Make a new name for the extract_expsyms_cmds to use
|
2001-03-31 08:08:03 +08:00
|
|
|
soroot="$soname"
|
2003-03-21 04:24:21 +08:00
|
|
|
soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
|
|
|
|
newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
|
2000-01-25 04:34:46 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# If the library has no export list, then create one now
|
|
|
|
if test -f "$output_objdir/$soname-def"; then :
|
|
|
|
else
|
|
|
|
$show "extracting exported symbol list from \`$soname'"
|
2001-09-11 07:33:26 +08:00
|
|
|
save_ifs="$IFS"; IFS='~'
|
2003-11-22 22:03:35 +08:00
|
|
|
cmds=$extract_expsyms_cmds
|
2000-01-20 04:34:37 +08:00
|
|
|
for cmd in $cmds; do
|
|
|
|
IFS="$save_ifs"
|
2003-11-22 22:03:35 +08:00
|
|
|
eval cmd=\"$cmd\"
|
2000-01-20 04:34:37 +08:00
|
|
|
$show "$cmd"
|
|
|
|
$run eval "$cmd" || exit $?
|
|
|
|
done
|
|
|
|
IFS="$save_ifs"
|
|
|
|
fi
|
2000-01-25 04:34:46 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Create $newlib
|
|
|
|
if test -f "$output_objdir/$newlib"; then :; else
|
|
|
|
$show "generating import library for \`$soname'"
|
2001-09-11 07:33:26 +08:00
|
|
|
save_ifs="$IFS"; IFS='~'
|
2003-11-22 22:03:35 +08:00
|
|
|
cmds=$old_archive_from_expsyms_cmds
|
2000-01-20 04:34:37 +08:00
|
|
|
for cmd in $cmds; do
|
|
|
|
IFS="$save_ifs"
|
2003-11-22 22:03:35 +08:00
|
|
|
eval cmd=\"$cmd\"
|
2000-01-20 04:34:37 +08:00
|
|
|
$show "$cmd"
|
|
|
|
$run eval "$cmd" || exit $?
|
|
|
|
done
|
|
|
|
IFS="$save_ifs"
|
|
|
|
fi
|
|
|
|
# make sure the library variables are pointing to the new library
|
|
|
|
dir=$output_objdir
|
|
|
|
linklib=$newlib
|
2001-07-30 00:20:45 +08:00
|
|
|
fi # test -n "$old_archive_from_expsyms_cmds"
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$linkmode" = prog || test "$mode" != relink; then
|
2000-01-28 04:33:40 +08:00
|
|
|
add_shlibpath=
|
|
|
|
add_dir=
|
|
|
|
add=
|
2000-01-20 04:34:37 +08:00
|
|
|
lib_linked=yes
|
2001-03-06 04:08:09 +08:00
|
|
|
case $hardcode_action in
|
2000-01-20 04:34:37 +08:00
|
|
|
immediate | unsupported)
|
|
|
|
if test "$hardcode_direct" = no; then
|
2003-03-21 04:24:21 +08:00
|
|
|
add="$dir/$linklib"
|
2002-05-21 22:05:20 +08:00
|
|
|
case $host in
|
|
|
|
*-*-sco3.2v5* ) add_dir="-L$dir" ;;
|
2003-03-21 04:24:21 +08:00
|
|
|
*-*-darwin* )
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
# if the lib is a (non-dlopened) module then we can not
|
|
|
|
# link against it, someone is ignoring the earlier warnings
|
2004-02-13 07:47:46 +08:00
|
|
|
if /usr/bin/file -L $add 2> /dev/null |
|
2004-08-26 17:02:42 +08:00
|
|
|
$GREP "bundle" >/dev/null ; then
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
if test "X$dlopenmodule" != "X$lib"; then
|
|
|
|
$echo "*** Warning: lib $linklib is a module, not a shared library"
|
2004-08-26 17:02:42 +08:00
|
|
|
if test -z "$old_library" ; then
|
|
|
|
$echo
|
|
|
|
$echo "*** And there doesn't seem to be a static archive available"
|
|
|
|
$echo "*** The link will probably fail, sorry"
|
|
|
|
else
|
|
|
|
add="$dir/$old_library"
|
|
|
|
fi
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
elif test -n "$old_library"; then
|
2004-08-26 17:02:42 +08:00
|
|
|
add="$dir/$old_library"
|
2003-09-10 16:40:42 +08:00
|
|
|
fi
|
2003-03-21 04:24:21 +08:00
|
|
|
fi
|
2002-05-21 22:05:20 +08:00
|
|
|
esac
|
2000-01-20 04:34:37 +08:00
|
|
|
elif test "$hardcode_minus_L" = no; then
|
2001-03-06 04:08:09 +08:00
|
|
|
case $host in
|
2000-01-20 04:34:37 +08:00
|
|
|
*-*-sunos*) add_shlibpath="$dir" ;;
|
|
|
|
esac
|
|
|
|
add_dir="-L$dir"
|
2000-01-28 04:33:40 +08:00
|
|
|
add="-l$name"
|
2000-01-20 04:34:37 +08:00
|
|
|
elif test "$hardcode_shlibpath_var" = no; then
|
|
|
|
add_shlibpath="$dir"
|
2000-01-28 04:33:40 +08:00
|
|
|
add="-l$name"
|
2000-01-20 04:34:37 +08:00
|
|
|
else
|
|
|
|
lib_linked=no
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
relink)
|
|
|
|
if test "$hardcode_direct" = yes; then
|
2000-01-28 04:33:40 +08:00
|
|
|
add="$dir/$linklib"
|
2000-01-20 04:34:37 +08:00
|
|
|
elif test "$hardcode_minus_L" = yes; then
|
|
|
|
add_dir="-L$dir"
|
2002-11-04 01:35:37 +08:00
|
|
|
# Try looking first in the location we're being installed to.
|
|
|
|
if test -n "$inst_prefix_dir"; then
|
|
|
|
case "$libdir" in
|
|
|
|
[\\/]*)
|
2003-11-01 23:03:09 +08:00
|
|
|
add_dir="$add_dir -L$inst_prefix_dir$libdir"
|
2002-11-04 01:35:37 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
2000-01-28 04:33:40 +08:00
|
|
|
add="-l$name"
|
2000-01-20 04:34:37 +08:00
|
|
|
elif test "$hardcode_shlibpath_var" = yes; then
|
|
|
|
add_shlibpath="$dir"
|
2000-01-28 04:33:40 +08:00
|
|
|
add="-l$name"
|
2000-01-20 04:34:37 +08:00
|
|
|
else
|
|
|
|
lib_linked=no
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
*) lib_linked=no ;;
|
|
|
|
esac
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test "$lib_linked" != yes; then
|
|
|
|
$echo "$modename: configuration error: unsupported hardcode properties"
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test -n "$add_shlibpath"; then
|
2001-03-06 04:08:09 +08:00
|
|
|
case :$compile_shlibpath: in
|
2000-01-20 04:34:37 +08:00
|
|
|
*":$add_shlibpath:"*) ;;
|
|
|
|
*) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
|
|
|
|
esac
|
|
|
|
fi
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$linkmode" = prog; then
|
2000-02-24 07:10:05 +08:00
|
|
|
test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
|
|
|
|
test -n "$add" && compile_deplibs="$add $compile_deplibs"
|
2000-01-28 04:33:40 +08:00
|
|
|
else
|
2000-02-24 07:10:05 +08:00
|
|
|
test -n "$add_dir" && deplibs="$add_dir $deplibs"
|
|
|
|
test -n "$add" && deplibs="$add $deplibs"
|
2004-02-13 07:47:46 +08:00
|
|
|
if test "$hardcode_direct" != yes &&
|
|
|
|
test "$hardcode_minus_L" != yes &&
|
2000-01-28 04:33:40 +08:00
|
|
|
test "$hardcode_shlibpath_var" = yes; then
|
2001-03-06 04:08:09 +08:00
|
|
|
case :$finalize_shlibpath: in
|
2000-02-24 07:10:05 +08:00
|
|
|
*":$libdir:"*) ;;
|
|
|
|
*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
|
|
|
|
esac
|
2000-01-28 04:33:40 +08:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$linkmode" = prog || test "$mode" = relink; then
|
2000-01-28 04:33:40 +08:00
|
|
|
add_shlibpath=
|
|
|
|
add_dir=
|
|
|
|
add=
|
|
|
|
# Finalize command for both is simple: just hardcode it.
|
2000-01-20 04:34:37 +08:00
|
|
|
if test "$hardcode_direct" = yes; then
|
2000-01-28 04:33:40 +08:00
|
|
|
add="$libdir/$linklib"
|
2000-01-20 04:34:37 +08:00
|
|
|
elif test "$hardcode_minus_L" = yes; then
|
|
|
|
add_dir="-L$libdir"
|
2000-01-28 04:33:40 +08:00
|
|
|
add="-l$name"
|
2000-01-20 04:34:37 +08:00
|
|
|
elif test "$hardcode_shlibpath_var" = yes; then
|
2001-03-06 04:08:09 +08:00
|
|
|
case :$finalize_shlibpath: in
|
2000-01-20 04:34:37 +08:00
|
|
|
*":$libdir:"*) ;;
|
|
|
|
*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
|
|
|
|
esac
|
2000-01-28 04:33:40 +08:00
|
|
|
add="-l$name"
|
2003-04-03 00:44:38 +08:00
|
|
|
elif test "$hardcode_automatic" = yes; then
|
2004-02-13 07:47:46 +08:00
|
|
|
if test -n "$inst_prefix_dir" &&
|
|
|
|
test -f "$inst_prefix_dir$libdir/$linklib" ; then
|
2004-08-26 17:02:42 +08:00
|
|
|
add="$inst_prefix_dir$libdir/$linklib"
|
2003-04-03 00:44:38 +08:00
|
|
|
else
|
2004-08-26 17:02:42 +08:00
|
|
|
add="$libdir/$linklib"
|
2003-04-03 00:44:38 +08:00
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
else
|
2000-01-28 04:33:40 +08:00
|
|
|
# We cannot seem to hardcode it, guess we'll fake it.
|
|
|
|
add_dir="-L$libdir"
|
2002-11-04 01:35:37 +08:00
|
|
|
# Try looking first in the location we're being installed to.
|
|
|
|
if test -n "$inst_prefix_dir"; then
|
|
|
|
case "$libdir" in
|
|
|
|
[\\/]*)
|
2003-11-01 23:03:09 +08:00
|
|
|
add_dir="$add_dir -L$inst_prefix_dir$libdir"
|
2002-11-04 01:35:37 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
2000-01-28 04:33:40 +08:00
|
|
|
add="-l$name"
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$linkmode" = prog; then
|
2000-02-24 07:10:05 +08:00
|
|
|
test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
|
|
|
|
test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
|
2000-01-20 04:34:37 +08:00
|
|
|
else
|
2000-02-24 07:10:05 +08:00
|
|
|
test -n "$add_dir" && deplibs="$add_dir $deplibs"
|
2000-07-24 13:15:35 +08:00
|
|
|
test -n "$add" && deplibs="$add $deplibs"
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
|
|
|
fi
|
2001-07-30 00:20:45 +08:00
|
|
|
elif test "$linkmode" = prog; then
|
2000-01-20 04:34:37 +08:00
|
|
|
# Here we assume that one of hardcode_direct or hardcode_minus_L
|
|
|
|
# is not unsupported. This is valid on all known static and
|
|
|
|
# shared platforms.
|
|
|
|
if test "$hardcode_direct" != unsupported; then
|
|
|
|
test -n "$old_library" && linklib="$old_library"
|
2000-02-24 07:10:05 +08:00
|
|
|
compile_deplibs="$dir/$linklib $compile_deplibs"
|
|
|
|
finalize_deplibs="$dir/$linklib $finalize_deplibs"
|
2000-01-20 04:34:37 +08:00
|
|
|
else
|
2000-02-24 07:10:05 +08:00
|
|
|
compile_deplibs="-l$name -L$dir $compile_deplibs"
|
|
|
|
finalize_deplibs="-l$name -L$dir $finalize_deplibs"
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
|
|
|
elif test "$build_libtool_libs" = yes; then
|
|
|
|
# Not a shared library
|
|
|
|
if test "$deplibs_check_method" != pass_all; then
|
|
|
|
# We're trying link a shared library against a static one
|
|
|
|
# but the system doesn't support it.
|
2001-04-25 04:30:21 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Just print a warning and add the library to dependency_libs so
|
|
|
|
# that the program can be linked against the static library.
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo
|
|
|
|
$echo "*** Warning: This system can not link to static lib archive $lib."
|
|
|
|
$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."
|
2001-04-25 04:30:21 +08:00
|
|
|
if test "$module" = yes; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "*** But as you try to build a module library, libtool will still create "
|
|
|
|
$echo "*** a static module, that should work as long as the dlopening application"
|
|
|
|
$echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
|
2001-04-25 04:30:21 +08:00
|
|
|
if test -z "$global_symbol_pipe"; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo
|
|
|
|
$echo "*** However, this would only work if libtool was able to extract symbol"
|
|
|
|
$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
|
|
|
|
$echo "*** not find such a program. So, this module is probably useless."
|
|
|
|
$echo "*** \`nm' from GNU binutils and a full rebuild may help."
|
2001-04-25 04:30:21 +08:00
|
|
|
fi
|
|
|
|
if test "$build_old_libs" = no; then
|
2001-09-03 06:07:38 +08:00
|
|
|
build_libtool_libs=module
|
|
|
|
build_old_libs=yes
|
2001-04-25 04:30:21 +08:00
|
|
|
else
|
2001-09-03 06:07:38 +08:00
|
|
|
build_libtool_libs=no
|
2001-04-25 04:30:21 +08:00
|
|
|
fi
|
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
else
|
|
|
|
convenience="$convenience $dir/$old_library"
|
|
|
|
old_convenience="$old_convenience $dir/$old_library"
|
2000-02-24 07:10:05 +08:00
|
|
|
deplibs="$dir/$old_library $deplibs"
|
2000-01-20 04:34:37 +08:00
|
|
|
link_static=yes
|
|
|
|
fi
|
2001-04-25 04:30:21 +08:00
|
|
|
fi # link shared/static library?
|
2000-01-20 04:34:37 +08:00
|
|
|
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$linkmode" = lib; then
|
2000-01-20 04:34:37 +08:00
|
|
|
if test -n "$dependency_libs" &&
|
2004-02-13 07:47:46 +08:00
|
|
|
{ test "$hardcode_into_libs" != yes ||
|
|
|
|
test "$build_old_libs" = yes ||
|
2001-07-30 00:20:45 +08:00
|
|
|
test "$link_static" = yes; }; then
|
2000-01-20 04:34:37 +08:00
|
|
|
# Extract -R from dependency_libs
|
|
|
|
temp_deplibs=
|
|
|
|
for libdir in $dependency_libs; do
|
2001-03-06 04:08:09 +08:00
|
|
|
case $libdir in
|
2000-01-20 04:34:37 +08:00
|
|
|
-R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
|
|
|
|
case " $xrpath " in
|
|
|
|
*" $temp_xrpath "*) ;;
|
|
|
|
*) xrpath="$xrpath $temp_xrpath";;
|
|
|
|
esac;;
|
|
|
|
*) temp_deplibs="$temp_deplibs $libdir";;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
dependency_libs="$temp_deplibs"
|
|
|
|
fi
|
|
|
|
|
2000-05-03 21:26:03 +08:00
|
|
|
newlib_search_path="$newlib_search_path $absdir"
|
2000-01-20 04:34:37 +08:00
|
|
|
# Link against this library
|
2000-02-24 07:10:05 +08:00
|
|
|
test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
|
2000-01-20 04:34:37 +08:00
|
|
|
# ... and its dependency_libs
|
2000-02-24 07:10:05 +08:00
|
|
|
tmp_libs=
|
|
|
|
for deplib in $dependency_libs; do
|
|
|
|
newdependency_libs="$deplib $newdependency_libs"
|
2001-11-28 03:31:22 +08:00
|
|
|
if test "X$duplicate_deps" = "Xyes" ; then
|
|
|
|
case "$tmp_libs " in
|
|
|
|
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
|
|
|
esac
|
|
|
|
fi
|
2000-02-24 07:10:05 +08:00
|
|
|
tmp_libs="$tmp_libs $deplib"
|
|
|
|
done
|
2000-01-20 04:34:37 +08:00
|
|
|
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$link_all_deplibs" != no; then
|
2000-01-20 04:34:37 +08:00
|
|
|
# Add the search paths of all dependency libraries
|
2004-06-21 22:52:57 +08:00
|
|
|
for deplib in $dependency_libs $inherited_linker_flags; do
|
2001-03-06 04:08:09 +08:00
|
|
|
case $deplib in
|
2000-01-20 04:34:37 +08:00
|
|
|
-L*) path="$deplib" ;;
|
2000-01-25 04:34:46 +08:00
|
|
|
*.la)
|
2000-02-02 00:43:34 +08:00
|
|
|
dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
|
|
|
|
test "X$dir" = "X$deplib" && dir="."
|
|
|
|
# We need an absolute path.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $dir in
|
2000-02-02 00:43:34 +08:00
|
|
|
[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
|
|
|
|
*)
|
|
|
|
absdir=`cd "$dir" && pwd`
|
|
|
|
if test -z "$absdir"; then
|
|
|
|
$echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
|
|
|
|
absdir="$dir"
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
2004-01-22 23:27:25 +08:00
|
|
|
if $GREP "^installed=no" $deplib > /dev/null; then
|
2003-02-24 07:49:34 +08:00
|
|
|
case $host in
|
|
|
|
*-*-darwin*)
|
2004-08-26 21:13:03 +08:00
|
|
|
depdepl=
|
2003-03-29 12:09:00 +08:00
|
|
|
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
|
|
|
|
if test -n "$deplibrary_names" ; then
|
|
|
|
for tmp in $deplibrary_names ; do
|
|
|
|
depdepl=$tmp
|
|
|
|
done
|
2004-08-26 21:13:03 +08:00
|
|
|
if test -f "$absdir/$objdir/$depdepl" ; then
|
|
|
|
depdepl="$absdir/$objdir/$depdepl"
|
|
|
|
eval darwin_install_name=`otool -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//' | xargs`
|
|
|
|
compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
|
|
|
|
linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
|
|
|
|
path=
|
2004-02-13 07:47:46 +08:00
|
|
|
fi
|
2003-03-21 04:24:21 +08:00
|
|
|
fi
|
2003-02-24 07:49:34 +08:00
|
|
|
;;
|
2003-03-29 12:09:00 +08:00
|
|
|
*)
|
2004-08-26 21:13:03 +08:00
|
|
|
path="-L$absdir/$objdir"
|
2004-02-13 07:47:46 +08:00
|
|
|
;;
|
2003-09-10 16:40:42 +08:00
|
|
|
esac
|
2004-08-26 21:13:03 +08:00
|
|
|
else
|
|
|
|
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
|
|
|
if test -z "$libdir"; then
|
|
|
|
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
|
|
|
|
exit $EXIT_FAILURE
|
|
|
|
fi
|
|
|
|
if test "$absdir" != "$libdir"; then
|
|
|
|
$echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
|
|
|
|
fi
|
|
|
|
path="-L$absdir"
|
|
|
|
fi
|
2003-02-24 07:49:34 +08:00
|
|
|
;;
|
2003-09-10 16:40:42 +08:00
|
|
|
esac
|
2003-02-24 07:49:34 +08:00
|
|
|
case " $deplibs " in
|
2000-01-20 04:34:37 +08:00
|
|
|
*" $path "*) ;;
|
2000-02-24 07:10:05 +08:00
|
|
|
*) deplibs="$deplibs $path" ;;
|
2000-01-20 04:34:37 +08:00
|
|
|
esac
|
|
|
|
done
|
2001-04-25 04:30:21 +08:00
|
|
|
fi # link_all_deplibs != no
|
|
|
|
fi # linkmode = lib
|
|
|
|
done # for deplib in $libs
|
2001-05-28 07:20:45 +08:00
|
|
|
dependency_libs="$newdependency_libs"
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$pass" = dlpreopen; then
|
2000-02-24 07:10:05 +08:00
|
|
|
# Link the dlpreopened libraries before other libraries
|
2000-03-27 07:01:20 +08:00
|
|
|
for deplib in $save_deplibs; do
|
|
|
|
deplibs="$deplib $deplibs"
|
|
|
|
done
|
|
|
|
fi
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$pass" != dlopen; then
|
|
|
|
if test "$pass" != conv; then
|
2000-05-03 21:26:03 +08:00
|
|
|
# Make sure lib_search_path contains only unique directories.
|
|
|
|
lib_search_path=
|
|
|
|
for dir in $newlib_search_path; do
|
|
|
|
case "$lib_search_path " in
|
|
|
|
*" $dir "*) ;;
|
|
|
|
*) lib_search_path="$lib_search_path $dir" ;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
newlib_search_path=
|
|
|
|
fi
|
2000-02-24 07:10:05 +08:00
|
|
|
|
|
|
|
if test "$linkmode,$pass" != "prog,link"; then
|
|
|
|
vars="deplibs"
|
|
|
|
else
|
|
|
|
vars="compile_deplibs finalize_deplibs"
|
|
|
|
fi
|
|
|
|
for var in $vars dependency_libs; do
|
2001-04-01 07:51:10 +08:00
|
|
|
# Add libraries to $var in reverse order
|
2000-02-24 07:10:05 +08:00
|
|
|
eval tmp_libs=\"\$$var\"
|
|
|
|
new_libs=
|
|
|
|
for deplib in $tmp_libs; do
|
2001-05-28 07:20:45 +08:00
|
|
|
# FIXME: Pedantically, this is the right thing to do, so
|
|
|
|
# that some nasty dependency loop isn't accidentally
|
|
|
|
# broken:
|
|
|
|
#new_libs="$deplib $new_libs"
|
|
|
|
# Pragmatically, this seems to cause very few problems in
|
|
|
|
# practice:
|
2001-04-06 07:09:38 +08:00
|
|
|
case $deplib in
|
2001-09-03 06:07:38 +08:00
|
|
|
-L*) new_libs="$deplib $new_libs" ;;
|
2003-03-31 23:44:14 +08:00
|
|
|
-R*) ;;
|
2001-09-03 06:07:38 +08:00
|
|
|
*)
|
2001-05-28 07:20:45 +08:00
|
|
|
# And here is the reason: when a library appears more
|
|
|
|
# than once as an explicit dependence of a library, or
|
|
|
|
# is implicitly linked in more than once by the
|
|
|
|
# compiler, it is considered special, and multiple
|
|
|
|
# occurrences thereof are not removed. Compare this
|
|
|
|
# with having the same library being listed as a
|
|
|
|
# dependency of multiple other libraries: in this case,
|
|
|
|
# we know (pedantically, we assume) the library does not
|
|
|
|
# need to be listed more than once, so we keep only the
|
|
|
|
# last copy. This is not always right, but it is rare
|
|
|
|
# enough that we require users that really mean to play
|
|
|
|
# such unportable linking tricks to link the library
|
|
|
|
# using -Wl,-lname, so that libtool does not consider it
|
|
|
|
# for duplicate removal.
|
2001-09-03 06:07:38 +08:00
|
|
|
case " $specialdeplibs " in
|
|
|
|
*" $deplib "*) new_libs="$deplib $new_libs" ;;
|
|
|
|
*)
|
|
|
|
case " $new_libs " in
|
|
|
|
*" $deplib "*) ;;
|
|
|
|
*) new_libs="$deplib $new_libs" ;;
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
esac
|
2000-02-24 07:10:05 +08:00
|
|
|
done
|
|
|
|
tmp_libs=
|
|
|
|
for deplib in $new_libs; do
|
2001-03-06 04:08:09 +08:00
|
|
|
case $deplib in
|
2000-02-24 07:10:05 +08:00
|
|
|
-L*)
|
|
|
|
case " $tmp_libs " in
|
|
|
|
*" $deplib "*) ;;
|
|
|
|
*) tmp_libs="$tmp_libs $deplib" ;;
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
*) tmp_libs="$tmp_libs $deplib" ;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
eval $var=\"$tmp_libs\"
|
2001-04-25 04:30:21 +08:00
|
|
|
done # for var
|
2000-02-24 07:10:05 +08:00
|
|
|
fi
|
2004-02-13 07:47:46 +08:00
|
|
|
# Last step: remove runtime libs from dependency_libs
|
|
|
|
# (they stay in deplibs)
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
tmp_libs=
|
|
|
|
for i in $dependency_libs ; do
|
|
|
|
case " $predeps $postdeps $compiler_lib_search_path " in
|
|
|
|
*" $i "*)
|
|
|
|
i=""
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
if test -n "$i" ; then
|
|
|
|
tmp_libs="$tmp_libs $i"
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
dependency_libs=$tmp_libs
|
2001-04-25 04:30:21 +08:00
|
|
|
done # for pass
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$linkmode" = prog; then
|
2000-02-02 00:43:34 +08:00
|
|
|
dlfiles="$newdlfiles"
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
fi
|
|
|
|
if test "$linkmode" = prog || test "$linkmode" = lib; then
|
2000-02-02 00:43:34 +08:00
|
|
|
dlprefiles="$newdlprefiles"
|
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
|
2000-01-28 04:33:40 +08:00
|
|
|
case $linkmode in
|
2000-01-20 04:34:37 +08:00
|
|
|
oldlib)
|
2001-05-28 07:20:45 +08:00
|
|
|
if test -n "$deplibs"; then
|
|
|
|
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
|
|
|
|
fi
|
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
|
|
|
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$rpath"; then
|
|
|
|
$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$xrpath"; then
|
|
|
|
$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$vinfo"; then
|
2003-04-01 01:36:01 +08:00
|
|
|
$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$release"; then
|
|
|
|
$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
|
|
|
|
$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Now set the variables for building old libraries.
|
|
|
|
build_libtool_libs=no
|
|
|
|
oldlibs="$output"
|
|
|
|
objs="$objs$old_deplibs"
|
|
|
|
;;
|
|
|
|
|
|
|
|
lib)
|
|
|
|
# Make sure we only generate libraries of the form `libNAME.la'.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $outputname in
|
2000-01-20 04:34:37 +08:00
|
|
|
lib*)
|
|
|
|
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
|
2004-02-15 21:30:01 +08:00
|
|
|
eval shared_ext=\"$shrext_cmds\"
|
2000-01-20 04:34:37 +08:00
|
|
|
eval libname=\"$libname_spec\"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
if test "$module" = no; then
|
|
|
|
$echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
|
|
|
if test "$need_lib_prefix" != no; then
|
|
|
|
# Add the "lib" prefix for modules if required
|
|
|
|
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
|
2004-02-15 21:30:01 +08:00
|
|
|
eval shared_ext=\"$shrext_cmds\"
|
2000-01-20 04:34:37 +08:00
|
|
|
eval libname=\"$libname_spec\"
|
|
|
|
else
|
|
|
|
libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
if test -n "$objs"; then
|
|
|
|
if test "$deplibs_check_method" != pass_all; then
|
|
|
|
$echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2000-01-20 04:34:37 +08:00
|
|
|
else
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo
|
|
|
|
$echo "*** Warning: Linking the shared library $output against the non-libtool"
|
|
|
|
$echo "*** objects $objs is not portable!"
|
2000-01-20 04:34:37 +08:00
|
|
|
libobjs="$libobjs $objs"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2000-02-02 00:43:34 +08:00
|
|
|
if test "$dlself" != no; then
|
|
|
|
$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
set dummy $rpath
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$#" -gt 2; then
|
2000-01-20 04:34:37 +08:00
|
|
|
$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
|
|
|
|
fi
|
|
|
|
install_libdir="$2"
|
|
|
|
|
|
|
|
oldlibs=
|
|
|
|
if test -z "$rpath"; then
|
|
|
|
if test "$build_libtool_libs" = yes; then
|
|
|
|
# Building a libtool convenience library.
|
2001-05-28 07:20:45 +08:00
|
|
|
# Some compilers have problems with a `.al' extension so
|
2001-09-03 06:07:38 +08:00
|
|
|
# convenience libraries should have the same extension an
|
|
|
|
# archive normally would.
|
2000-01-20 04:34:37 +08:00
|
|
|
oldlibs="$output_objdir/$libname.$libext $oldlibs"
|
|
|
|
build_libtool_libs=convenience
|
|
|
|
build_old_libs=yes
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$vinfo"; then
|
2003-04-01 01:36:01 +08:00
|
|
|
$echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$release"; then
|
|
|
|
$echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
|
|
|
|
# Parse the version information argument.
|
2001-09-11 07:33:26 +08:00
|
|
|
save_ifs="$IFS"; IFS=':'
|
2000-01-20 04:34:37 +08:00
|
|
|
set dummy $vinfo 0 0 0
|
|
|
|
IFS="$save_ifs"
|
|
|
|
|
|
|
|
if test -n "$8"; then
|
|
|
|
$echo "$modename: too many parameters to \`-version-info'" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
|
|
|
|
2003-04-01 01:36:01 +08:00
|
|
|
# convert absolute version numbers to libtool ages
|
|
|
|
# this retains compatibility with .la files and attempts
|
|
|
|
# to make the code below a bit more comprehensible
|
2003-09-10 16:40:42 +08:00
|
|
|
|
2003-04-01 01:36:01 +08:00
|
|
|
case $vinfo_number in
|
|
|
|
yes)
|
|
|
|
number_major="$2"
|
|
|
|
number_minor="$3"
|
|
|
|
number_revision="$4"
|
|
|
|
#
|
|
|
|
# There are really only two kinds -- those that
|
|
|
|
# use the current revision as the major version
|
|
|
|
# and those that subtract age and use age as
|
|
|
|
# a minor version. But, then there is irix
|
|
|
|
# which has an extra 1 added just for fun
|
|
|
|
#
|
|
|
|
case $version_type in
|
|
|
|
darwin|linux|osf|windows)
|
|
|
|
current=`expr $number_major + $number_minor`
|
|
|
|
age="$number_minor"
|
|
|
|
revision="$number_revision"
|
|
|
|
;;
|
|
|
|
freebsd-aout|freebsd-elf|sunos)
|
|
|
|
current="$number_major"
|
|
|
|
revision="$number_minor"
|
|
|
|
age="0"
|
|
|
|
;;
|
|
|
|
irix|nonstopux)
|
|
|
|
current=`expr $number_major + $number_minor - 1`
|
|
|
|
age="$number_minor"
|
|
|
|
revision="$number_minor"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
no)
|
|
|
|
current="$2"
|
|
|
|
revision="$3"
|
|
|
|
age="$4"
|
|
|
|
;;
|
|
|
|
esac
|
2000-01-20 04:34:37 +08:00
|
|
|
|
|
|
|
# Check that each of the things are valid numbers.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $current in
|
2001-04-08 08:46:58 +08:00
|
|
|
0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
|
2000-01-20 04:34:37 +08:00
|
|
|
*)
|
|
|
|
$echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
|
|
|
|
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2000-01-20 04:34:37 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2001-03-06 04:08:09 +08:00
|
|
|
case $revision in
|
2001-04-08 08:46:58 +08:00
|
|
|
0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
|
2000-01-20 04:34:37 +08:00
|
|
|
*)
|
1999-10-30 18:39:28 +08:00
|
|
|
$echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
|
|
|
|
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2001-03-06 04:08:09 +08:00
|
|
|
case $age in
|
2001-04-08 08:46:58 +08:00
|
|
|
0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
|
1999-10-30 18:39:28 +08:00
|
|
|
*)
|
|
|
|
$echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
|
|
|
|
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$age" -gt "$current"; then
|
1999-10-30 18:39:28 +08:00
|
|
|
$echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
|
|
|
|
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Calculate the version variables.
|
|
|
|
major=
|
|
|
|
versuffix=
|
|
|
|
verstring=
|
2001-03-06 04:08:09 +08:00
|
|
|
case $version_type in
|
1999-10-30 18:39:28 +08:00
|
|
|
none) ;;
|
|
|
|
|
2001-04-01 21:46:08 +08:00
|
|
|
darwin)
|
|
|
|
# Like Linux, but with the current version available in
|
|
|
|
# verstring for coding it into the library header
|
|
|
|
major=.`expr $current - $age`
|
|
|
|
versuffix="$major.$age.$revision"
|
|
|
|
# Darwin ld doesn't like 0 for these options...
|
|
|
|
minor_current=`expr $current + 1`
|
2004-03-31 22:11:08 +08:00
|
|
|
verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
|
2001-04-01 21:46:08 +08:00
|
|
|
;;
|
|
|
|
|
|
|
|
freebsd-aout)
|
|
|
|
major=".$current"
|
|
|
|
versuffix=".$current.$revision";
|
|
|
|
;;
|
|
|
|
|
|
|
|
freebsd-elf)
|
|
|
|
major=".$current"
|
2004-05-18 00:41:23 +08:00
|
|
|
versuffix=".$current"
|
2001-04-01 21:46:08 +08:00
|
|
|
;;
|
|
|
|
|
2001-10-28 20:22:39 +08:00
|
|
|
irix | nonstopux)
|
2003-01-15 10:55:34 +08:00
|
|
|
major=`expr $current - $age + 1`
|
2002-06-13 19:01:47 +08:00
|
|
|
|
2001-10-28 20:22:39 +08:00
|
|
|
case $version_type in
|
|
|
|
nonstopux) verstring_prefix=nonstopux ;;
|
|
|
|
*) verstring_prefix=sgi ;;
|
|
|
|
esac
|
|
|
|
verstring="$verstring_prefix$major.$revision"
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# Add in all the interfaces that we are compatible with.
|
|
|
|
loop=$revision
|
2001-07-30 00:20:45 +08:00
|
|
|
while test "$loop" -ne 0; do
|
1999-10-30 18:39:28 +08:00
|
|
|
iface=`expr $revision - $loop`
|
|
|
|
loop=`expr $loop - 1`
|
2001-10-28 20:22:39 +08:00
|
|
|
verstring="$verstring_prefix$major.$iface:$verstring"
|
1999-10-30 18:39:28 +08:00
|
|
|
done
|
2000-07-24 14:09:03 +08:00
|
|
|
|
|
|
|
# Before this point, $major must not contain `.'.
|
|
|
|
major=.$major
|
|
|
|
versuffix="$major.$revision"
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
|
|
|
linux)
|
|
|
|
major=.`expr $current - $age`
|
|
|
|
versuffix="$major.$age.$revision"
|
|
|
|
;;
|
|
|
|
|
|
|
|
osf)
|
2002-09-10 02:26:34 +08:00
|
|
|
major=.`expr $current - $age`
|
1999-10-30 18:39:28 +08:00
|
|
|
versuffix=".$current.$age.$revision"
|
|
|
|
verstring="$current.$age.$revision"
|
|
|
|
|
|
|
|
# Add in all the interfaces that we are compatible with.
|
|
|
|
loop=$age
|
2001-07-30 00:20:45 +08:00
|
|
|
while test "$loop" -ne 0; do
|
1999-10-30 18:39:28 +08:00
|
|
|
iface=`expr $current - $loop`
|
|
|
|
loop=`expr $loop - 1`
|
|
|
|
verstring="$verstring:${iface}.0"
|
|
|
|
done
|
|
|
|
|
|
|
|
# Make executables depend on our current version.
|
|
|
|
verstring="$verstring:${current}.0"
|
|
|
|
;;
|
|
|
|
|
2004-05-18 00:41:23 +08:00
|
|
|
qnx)
|
|
|
|
major=".$current"
|
|
|
|
versuffix=".$current"
|
|
|
|
;;
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
sunos)
|
|
|
|
major=".$current"
|
|
|
|
versuffix=".$current.$revision"
|
|
|
|
;;
|
|
|
|
|
|
|
|
windows)
|
2000-09-15 10:26:04 +08:00
|
|
|
# Use '-' rather than '.', since we only want one
|
|
|
|
# extension on DOS 8.3 filesystems.
|
1999-10-30 18:39:28 +08:00
|
|
|
major=`expr $current - $age`
|
2000-09-15 10:26:04 +08:00
|
|
|
versuffix="-$major"
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
|
|
|
*)
|
|
|
|
$echo "$modename: unknown library version type \`$version_type'" 1>&2
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
# Clear the version info if we defaulted, and they specified a release.
|
|
|
|
if test -z "$vinfo" && test -n "$release"; then
|
|
|
|
major=
|
2001-09-03 06:07:38 +08:00
|
|
|
case $version_type in
|
|
|
|
darwin)
|
|
|
|
# we can't check for "0.0" in archive_cmds due to quoting
|
|
|
|
# problems, so we reset it completely
|
|
|
|
verstring=
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
verstring="0.0"
|
|
|
|
;;
|
|
|
|
esac
|
1999-10-30 18:39:28 +08:00
|
|
|
if test "$need_version" = no; then
|
|
|
|
versuffix=
|
|
|
|
else
|
|
|
|
versuffix=".0.0"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Remove version info from name if versioning should be avoided
|
|
|
|
if test "$avoid_version" = yes && test "$need_version" = no; then
|
|
|
|
major=
|
|
|
|
versuffix=
|
|
|
|
verstring=""
|
|
|
|
fi
|
2000-01-25 04:34:46 +08:00
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# Check to see if the archive will have undefined symbols.
|
|
|
|
if test "$allow_undefined" = yes; then
|
|
|
|
if test "$allow_undefined_flag" = unsupported; then
|
|
|
|
$echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
|
|
|
|
build_libtool_libs=no
|
|
|
|
build_old_libs=yes
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
# Don't allow undefined symbols.
|
|
|
|
allow_undefined_flag="$no_undefined_flag"
|
|
|
|
fi
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
func_generate_dlsyms "$libname" "$libname" "yes"
|
|
|
|
libobjs="$libobjs $symfileobj"
|
|
|
|
|
* update all copyright notices to 2000
* doc/libtool.texi (using libltdl): document new lt_dlinfo struct,
replace NULL with @code{NULL}, document lt_dlsetdata(),
lt_dlgetdata() and lt_dlgetinfo()
* libltdl/Makefile.am: increment interface version number
* libltdl/configure.in: set version number to 1.1
* libltdl/ltdl.c: make some variables public by moving them
to the info struct, add support for application specific data
within module handles, new lt_dlsetdata(), lt_dlgetdata() and
lt_dlgetinfo() functions,
fix memory leaks, minor cleanups
* libltdl/ltdl.h: ditto
* mdemo/main.c: demonstrate use of lt_dlgetinfo,
improved handling of errors
* ltconfig.in: set hardcode_into_libs = yes for GNU/Hurd, Linux
and Solaris, only hardcode *all* run-paths if hardcode_into_libs
is set to 'all', otherwise hardcode only user-specified rpaths
into libraries
* ltmain.in: minor cleanups, we don't need to add user-specified
rpaths to compile_rpath, finalize_rpath is sufficient
* ltconfig.in: transform linux* -> *linux-gnu* _after_ host_os has
been set! (reported by Bruno Haible <haible@ilog.fr>)
* configure.in: AC_SUBST reload_flag, deplibs_check_method
and file_magic_cmd
* README: use 'libtool --version' instead of 'ltconfig --version'
(suggested by Francios Pinard <pinard@iro.umontreal.ca>
2000-01-13 08:28:09 +08:00
|
|
|
if test "$mode" != relink; then
|
2001-05-28 07:20:45 +08:00
|
|
|
# Remove our outputs, but don't remove object files since they
|
2001-09-03 06:07:38 +08:00
|
|
|
# may have been created when compiling PIC objects.
|
|
|
|
removelist=
|
2003-03-21 04:24:21 +08:00
|
|
|
tempremovelist=`$echo "$output_objdir/*"`
|
2001-05-28 07:20:45 +08:00
|
|
|
for p in $tempremovelist; do
|
2001-09-03 06:07:38 +08:00
|
|
|
case $p in
|
|
|
|
*.$objext)
|
|
|
|
;;
|
|
|
|
$output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
|
2004-03-14 22:14:32 +08:00
|
|
|
if test "X$precious_files_regex" != "X"; then
|
2004-08-26 17:02:42 +08:00
|
|
|
if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
|
|
|
|
then
|
2004-03-14 22:14:32 +08:00
|
|
|
continue
|
|
|
|
fi
|
2004-01-12 10:32:50 +08:00
|
|
|
fi
|
2001-09-03 06:07:38 +08:00
|
|
|
removelist="$removelist $p"
|
|
|
|
;;
|
|
|
|
*) ;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
if test -n "$removelist"; then
|
2001-05-28 07:20:45 +08:00
|
|
|
$show "${rm}r $removelist"
|
|
|
|
$run ${rm}r $removelist
|
2001-09-03 06:07:38 +08:00
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Now set the variables for building old libraries.
|
|
|
|
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
|
|
|
|
oldlibs="$oldlibs $output_objdir/$libname.$libext"
|
|
|
|
|
|
|
|
# Transform .lo files to .o files.
|
|
|
|
oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
|
|
|
|
fi
|
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Eliminate all temporary directories.
|
2001-04-25 04:30:21 +08:00
|
|
|
for path in $notinst_path; do
|
2003-03-21 04:24:21 +08:00
|
|
|
lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
|
|
|
|
deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
|
|
|
|
dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
|
2000-01-20 04:34:37 +08:00
|
|
|
done
|
2000-01-25 04:34:46 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test -n "$xrpath"; then
|
|
|
|
# If the user specified any rpath flags, then add them.
|
|
|
|
temp_xrpath=
|
|
|
|
for libdir in $xrpath; do
|
|
|
|
temp_xrpath="$temp_xrpath -R$libdir"
|
|
|
|
case "$finalize_rpath " in
|
|
|
|
*" $libdir "*) ;;
|
|
|
|
*) finalize_rpath="$finalize_rpath $libdir" ;;
|
1999-10-30 18:39:28 +08:00
|
|
|
esac
|
2000-01-20 04:34:37 +08:00
|
|
|
done
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
|
2000-01-20 04:34:37 +08:00
|
|
|
dependency_libs="$temp_xrpath $dependency_libs"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2000-02-02 00:43:34 +08:00
|
|
|
# Make sure dlfiles contains only unique files that won't be dlpreopened
|
|
|
|
old_dlfiles="$dlfiles"
|
|
|
|
dlfiles=
|
|
|
|
for lib in $old_dlfiles; do
|
|
|
|
case " $dlprefiles $dlfiles " in
|
|
|
|
*" $lib "*) ;;
|
|
|
|
*) dlfiles="$dlfiles $lib" ;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
|
|
|
# Make sure dlprefiles contains only unique files
|
|
|
|
old_dlprefiles="$dlprefiles"
|
|
|
|
dlprefiles=
|
|
|
|
for lib in $old_dlprefiles; do
|
|
|
|
case "$dlprefiles " in
|
|
|
|
*" $lib "*) ;;
|
|
|
|
*) dlprefiles="$dlprefiles $lib" ;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test "$build_libtool_libs" = yes; then
|
|
|
|
if test -n "$rpath"; then
|
2001-03-06 04:08:09 +08:00
|
|
|
case $host in
|
2000-09-15 10:10:27 +08:00
|
|
|
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
|
2000-01-20 04:34:37 +08:00
|
|
|
# these systems don't actually have a c library (as such)!
|
|
|
|
;;
|
2001-04-01 21:46:08 +08:00
|
|
|
*-*-rhapsody* | *-*-darwin1.[012])
|
|
|
|
# Rhapsody C library is in the System framework
|
2004-01-19 12:57:26 +08:00
|
|
|
deplibs="$deplibs System.ltframework"
|
2001-04-25 04:30:21 +08:00
|
|
|
;;
|
|
|
|
*-*-netbsd*)
|
|
|
|
# Don't link with libc until the a.out ld.so is fixed.
|
|
|
|
;;
|
2001-11-28 07:10:22 +08:00
|
|
|
*-*-openbsd* | *-*-freebsd*)
|
2001-08-19 06:25:17 +08:00
|
|
|
# Do not include libc due to us having libc/libc_r.
|
|
|
|
test "X$arg" = "X-lc" && continue
|
2001-09-03 06:07:38 +08:00
|
|
|
;;
|
2001-06-28 01:56:09 +08:00
|
|
|
*)
|
2001-04-25 04:30:21 +08:00
|
|
|
# Add libc to deplibs on all other systems if necessary.
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$build_libtool_need_lc" = "yes"; then
|
2001-04-25 04:30:21 +08:00
|
|
|
deplibs="$deplibs -lc"
|
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Transform deplibs into only deplibs that can be linked in shared.
|
|
|
|
name_save=$name
|
|
|
|
libname_save=$libname
|
|
|
|
release_save=$release
|
|
|
|
versuffix_save=$versuffix
|
|
|
|
major_save=$major
|
|
|
|
# I'm not sure if I'm treating the release correctly. I think
|
|
|
|
# release should show up in the -l (ie -lgmp5) so we don't want to
|
|
|
|
# add it in twice. Is that correct?
|
|
|
|
release=""
|
|
|
|
versuffix=""
|
|
|
|
major=""
|
|
|
|
newdeplibs=
|
|
|
|
droppeddeps=no
|
2001-03-06 04:08:09 +08:00
|
|
|
case $deplibs_check_method in
|
2000-01-20 04:34:37 +08:00
|
|
|
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
|
2002-09-25 12:26:20 +08:00
|
|
|
# implementing what was already the behavior.
|
2000-01-20 04:34:37 +08:00
|
|
|
newdeplibs=$deplibs
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
2000-01-20 04:34:37 +08:00
|
|
|
test_compile)
|
|
|
|
# This code stresses the "libraries are programs" paradigm to its
|
|
|
|
# limits. Maybe even breaks it. We compile a program, linking it
|
|
|
|
# against the deplibs as a proxy for the library. Then we can check
|
|
|
|
# whether they linked in statically or dynamically with ldd.
|
|
|
|
$rm conftest.c
|
|
|
|
cat > conftest.c <<EOF
|
|
|
|
int main() { return 0; }
|
|
|
|
EOF
|
|
|
|
$rm conftest
|
2001-05-28 07:20:45 +08:00
|
|
|
$LTCC -o conftest conftest.c $deplibs
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$?" -eq 0 ; then
|
2000-01-20 04:34:37 +08:00
|
|
|
ldd_output=`ldd conftest`
|
|
|
|
for i in $deplibs; do
|
|
|
|
name="`expr $i : '-l\(.*\)'`"
|
|
|
|
# If $name is empty we are operating on a -L argument.
|
2004-08-26 17:02:42 +08:00
|
|
|
if test "$name" != "" && test "$name" -ne "0"; then
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
|
|
|
case " $predeps $postdeps " in
|
|
|
|
*" $i "*)
|
|
|
|
newdeplibs="$newdeplibs $i"
|
|
|
|
i=""
|
Don't assume that egrep and fgrep exist. POSIX 1003.1-2001 no
longer requires them; you're supposed to use grep -E and grep -F
instead. Also, don't assume that "test -a" works, since POSIX
doesn't require it.
* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER, _LT_AC_LANG_C_CONFIG,
_LT_AC_LANG_CXX_CONFIG, AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE,
AC_LIBTOOL_PROG_LD_SHLIBS):
egrep -> grep, when that makes no difference.
* libtoolize.in: Likewise.
* ltdl.m4 (AC_LTDL_SYMBOL_USCORE): Likewise.
* ltmain.in: Likewise.
* demo/Makefile.am (hc-direct): Likewise.
* pdemo/Makefile.am (hc-direct): Likewise.
* tests/build-relink.test, tests/build-relink2.test,
tests/cdemo-conf.test, tests/cdemo-shared.test,
tests/cdemo-static.test, tests/demo-conf.test,
tests/demo-nofast.test, tests/demo-shared.test,
tests/demo-static.test, tests/depdemo-conf.test,
tests/depdemo-nofast.test, tests/depdemo-shared.test,
tests/depdemo-static.test, tests/hardcode.test,
tests/mdemo-conf.test, tests/mdemo-shared.test,
tests/mdemo-static.test, tests/pdemo-conf.test,
tests/tagdemo-conf.test, tests/tagdemo-shared.test,
tests/tagdemo-static.test: Likewise.
* libtool.m4 (AC_PROG_EGREP):
New macro, defined if Autoconf doesn't define.
(AC_PATH_TOOL_PREFIX, AC_PROG_LD_GNU): Use it.
(AC_PROG_LD, AC_PROG_NM, AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE):
Use shell pattern matching rather than egrep.
(AC_LIBTOOL_CONFIG): Set lt_EGREP and EGREP.
* demo/Makefile.am (SET_HARDCODE_FLAGS): Use sed instead of egrep.
* pdemo/Makefile.am (SET_HARDCODE_FLAGS): Likewise.
* tests/defs (EGREP, FGREP): New vars.
* ltmain.in: egrep -> $EGREP
* tests/assign.test, tests/demo-exec.test, tests/demo-inst.test,
tests/pdemo-exec.test, tests/pdemo-inst.test, tests/sh.test:
Likewise.
* tests/hardcode.test: fgrep -> $FGREP
* tests/f77demo-exec.test: test -a -> test &&
2002-11-19 17:42:39 +08:00
|
|
|
;;
|
|
|
|
esac
|
2004-08-26 17:02:42 +08:00
|
|
|
fi
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
if test -n "$i" ; then
|
|
|
|
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
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo
|
|
|
|
$echo "*** Warning: dynamic linker does not accept needed library $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 I believe you do not have"
|
|
|
|
$echo "*** because a test_compile did reveal that the linker did not use it for"
|
|
|
|
$echo "*** its dynamic dependency list that programs get resolved with at runtime."
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
|
|
|
else
|
|
|
|
newdeplibs="$newdeplibs $i"
|
|
|
|
fi
|
|
|
|
done
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
2002-09-25 12:26:20 +08:00
|
|
|
# Error occurred in the first compile. Let's try to salvage
|
2001-11-15 09:01:13 +08:00
|
|
|
# the situation: Compile a separate program for each library.
|
2000-01-20 04:34:37 +08:00
|
|
|
for i in $deplibs; do
|
|
|
|
name="`expr $i : '-l\(.*\)'`"
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
# If $name is empty we are operating on a -L argument.
|
2004-08-26 17:02:42 +08:00
|
|
|
if test "$name" != "" && test "$name" != "0"; then
|
2000-01-20 04:34:37 +08:00
|
|
|
$rm conftest
|
2001-05-28 07:20:45 +08:00
|
|
|
$LTCC -o conftest conftest.c $i
|
2000-01-20 04:34:37 +08:00
|
|
|
# Did it work?
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$?" -eq 0 ; then
|
2000-01-20 04:34:37 +08:00
|
|
|
ldd_output=`ldd conftest`
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
|
|
|
case " $predeps $postdeps " in
|
|
|
|
*" $i "*)
|
|
|
|
newdeplibs="$newdeplibs $i"
|
|
|
|
i=""
|
Don't assume that egrep and fgrep exist. POSIX 1003.1-2001 no
longer requires them; you're supposed to use grep -E and grep -F
instead. Also, don't assume that "test -a" works, since POSIX
doesn't require it.
* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER, _LT_AC_LANG_C_CONFIG,
_LT_AC_LANG_CXX_CONFIG, AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE,
AC_LIBTOOL_PROG_LD_SHLIBS):
egrep -> grep, when that makes no difference.
* libtoolize.in: Likewise.
* ltdl.m4 (AC_LTDL_SYMBOL_USCORE): Likewise.
* ltmain.in: Likewise.
* demo/Makefile.am (hc-direct): Likewise.
* pdemo/Makefile.am (hc-direct): Likewise.
* tests/build-relink.test, tests/build-relink2.test,
tests/cdemo-conf.test, tests/cdemo-shared.test,
tests/cdemo-static.test, tests/demo-conf.test,
tests/demo-nofast.test, tests/demo-shared.test,
tests/demo-static.test, tests/depdemo-conf.test,
tests/depdemo-nofast.test, tests/depdemo-shared.test,
tests/depdemo-static.test, tests/hardcode.test,
tests/mdemo-conf.test, tests/mdemo-shared.test,
tests/mdemo-static.test, tests/pdemo-conf.test,
tests/tagdemo-conf.test, tests/tagdemo-shared.test,
tests/tagdemo-static.test: Likewise.
* libtool.m4 (AC_PROG_EGREP):
New macro, defined if Autoconf doesn't define.
(AC_PATH_TOOL_PREFIX, AC_PROG_LD_GNU): Use it.
(AC_PROG_LD, AC_PROG_NM, AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE):
Use shell pattern matching rather than egrep.
(AC_LIBTOOL_CONFIG): Set lt_EGREP and EGREP.
* demo/Makefile.am (SET_HARDCODE_FLAGS): Use sed instead of egrep.
* pdemo/Makefile.am (SET_HARDCODE_FLAGS): Likewise.
* tests/defs (EGREP, FGREP): New vars.
* ltmain.in: egrep -> $EGREP
* tests/assign.test, tests/demo-exec.test, tests/demo-inst.test,
tests/pdemo-exec.test, tests/pdemo-inst.test, tests/sh.test:
Likewise.
* tests/hardcode.test: fgrep -> $FGREP
* tests/f77demo-exec.test: test -a -> test &&
2002-11-19 17:42:39 +08:00
|
|
|
;;
|
|
|
|
esac
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
fi
|
|
|
|
if test -n "$i" ; then
|
|
|
|
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
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo
|
|
|
|
$echo "*** Warning: dynamic linker does not accept needed library $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"
|
|
|
|
$echo "*** because a test_compile did reveal that the linker did not use this one"
|
|
|
|
$echo "*** as a dynamic dependency that programs can get resolved with at runtime."
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
|
|
|
else
|
|
|
|
droppeddeps=yes
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo
|
|
|
|
$echo "*** Warning! Library $i is needed by this library but I was not able to"
|
|
|
|
$echo "*** make it link in! You will probably need to install it or some"
|
|
|
|
$echo "*** library that it depends on before this library will be fully"
|
|
|
|
$echo "*** functional. Installing it before continuing would be even better."
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
|
|
|
else
|
|
|
|
newdeplibs="$newdeplibs $i"
|
|
|
|
fi
|
|
|
|
done
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
;;
|
2000-01-20 04:34:37 +08:00
|
|
|
file_magic*)
|
|
|
|
set dummy $deplibs_check_method
|
|
|
|
file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
|
|
|
|
for a_deplib in $deplibs; do
|
|
|
|
name="`expr $a_deplib : '-l\(.*\)'`"
|
|
|
|
# If $name is empty we are operating on a -L argument.
|
2004-08-26 17:02:42 +08:00
|
|
|
if test "$name" != "" && test "$name" != "0"; then
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
|
|
|
case " $predeps $postdeps " in
|
|
|
|
*" $a_deplib "*)
|
|
|
|
newdeplibs="$newdeplibs $a_deplib"
|
Don't assume that egrep and fgrep exist. POSIX 1003.1-2001 no
longer requires them; you're supposed to use grep -E and grep -F
instead. Also, don't assume that "test -a" works, since POSIX
doesn't require it.
* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER, _LT_AC_LANG_C_CONFIG,
_LT_AC_LANG_CXX_CONFIG, AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE,
AC_LIBTOOL_PROG_LD_SHLIBS):
egrep -> grep, when that makes no difference.
* libtoolize.in: Likewise.
* ltdl.m4 (AC_LTDL_SYMBOL_USCORE): Likewise.
* ltmain.in: Likewise.
* demo/Makefile.am (hc-direct): Likewise.
* pdemo/Makefile.am (hc-direct): Likewise.
* tests/build-relink.test, tests/build-relink2.test,
tests/cdemo-conf.test, tests/cdemo-shared.test,
tests/cdemo-static.test, tests/demo-conf.test,
tests/demo-nofast.test, tests/demo-shared.test,
tests/demo-static.test, tests/depdemo-conf.test,
tests/depdemo-nofast.test, tests/depdemo-shared.test,
tests/depdemo-static.test, tests/hardcode.test,
tests/mdemo-conf.test, tests/mdemo-shared.test,
tests/mdemo-static.test, tests/pdemo-conf.test,
tests/tagdemo-conf.test, tests/tagdemo-shared.test,
tests/tagdemo-static.test: Likewise.
* libtool.m4 (AC_PROG_EGREP):
New macro, defined if Autoconf doesn't define.
(AC_PATH_TOOL_PREFIX, AC_PROG_LD_GNU): Use it.
(AC_PROG_LD, AC_PROG_NM, AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE):
Use shell pattern matching rather than egrep.
(AC_LIBTOOL_CONFIG): Set lt_EGREP and EGREP.
* demo/Makefile.am (SET_HARDCODE_FLAGS): Use sed instead of egrep.
* pdemo/Makefile.am (SET_HARDCODE_FLAGS): Likewise.
* tests/defs (EGREP, FGREP): New vars.
* ltmain.in: egrep -> $EGREP
* tests/assign.test, tests/demo-exec.test, tests/demo-inst.test,
tests/pdemo-exec.test, tests/pdemo-inst.test, tests/sh.test:
Likewise.
* tests/hardcode.test: fgrep -> $FGREP
* tests/f77demo-exec.test: test -a -> test &&
2002-11-19 17:42:39 +08:00
|
|
|
a_deplib=""
|
|
|
|
;;
|
|
|
|
esac
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
fi
|
|
|
|
if test -n "$a_deplib" ; then
|
|
|
|
libname=`eval \\$echo \"$libname_spec\"`
|
|
|
|
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
|
|
|
|
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
|
|
|
|
for potent_lib in $potential_libs; do
|
2000-01-20 04:34:37 +08:00
|
|
|
# Follow soft links.
|
2004-02-13 07:47:46 +08:00
|
|
|
if ls -lLd "$potent_lib" 2>/dev/null |
|
|
|
|
$GREP " -> " >/dev/null; then
|
2000-01-25 04:34:46 +08:00
|
|
|
continue
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
|
|
|
# The statement above tries to avoid entering an
|
|
|
|
# endless loop below, in case of cyclic links.
|
|
|
|
# We might still enter an endless loop, since a link
|
|
|
|
# loop can be closed while we follow links,
|
|
|
|
# but so what?
|
|
|
|
potlib="$potent_lib"
|
|
|
|
while test -h "$potlib" 2>/dev/null; do
|
2002-01-30 06:58:35 +08:00
|
|
|
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
|
2001-03-06 04:08:09 +08:00
|
|
|
case $potliblink in
|
2000-01-20 04:34:37 +08:00
|
|
|
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
|
|
|
|
*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
|
|
|
|
esac
|
|
|
|
done
|
2004-02-13 07:47:46 +08:00
|
|
|
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
|
|
|
|
${SED} 10q |
|
|
|
|
$EGREP "$file_magic_regex" > /dev/null; then
|
2000-01-20 04:34:37 +08:00
|
|
|
newdeplibs="$newdeplibs $a_deplib"
|
|
|
|
a_deplib=""
|
|
|
|
break 2
|
|
|
|
fi
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
done
|
|
|
|
done
|
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
if test -n "$a_deplib" ; then
|
|
|
|
droppeddeps=yes
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo
|
|
|
|
$echo "*** Warning: linker path does not have real file for library $a_deplib."
|
|
|
|
$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"
|
|
|
|
$echo "*** because I did check the linker path looking for a file starting"
|
2001-08-05 19:29:09 +08:00
|
|
|
if test -z "$potlib" ; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "*** with $libname but no candidates were found. (...for file magic test)"
|
2001-08-05 19:29:09 +08:00
|
|
|
else
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "*** with $libname and none of the candidates passed a file format test"
|
|
|
|
$echo "*** using a file magic. Last file checked: $potlib"
|
2001-08-05 19:29:09 +08:00
|
|
|
fi
|
2001-04-07 05:29:15 +08:00
|
|
|
fi
|
|
|
|
else
|
|
|
|
# Add a -L argument.
|
|
|
|
newdeplibs="$newdeplibs $a_deplib"
|
|
|
|
fi
|
|
|
|
done # Gone through all deplibs.
|
|
|
|
;;
|
|
|
|
match_pattern*)
|
|
|
|
set dummy $deplibs_check_method
|
|
|
|
match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
|
|
|
|
for a_deplib in $deplibs; do
|
|
|
|
name="`expr $a_deplib : '-l\(.*\)'`"
|
|
|
|
# If $name is empty we are operating on a -L argument.
|
2001-04-25 04:30:21 +08:00
|
|
|
if test -n "$name" && test "$name" != "0"; then
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
|
|
|
case " $predeps $postdeps " in
|
|
|
|
*" $a_deplib "*)
|
|
|
|
newdeplibs="$newdeplibs $a_deplib"
|
Don't assume that egrep and fgrep exist. POSIX 1003.1-2001 no
longer requires them; you're supposed to use grep -E and grep -F
instead. Also, don't assume that "test -a" works, since POSIX
doesn't require it.
* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER, _LT_AC_LANG_C_CONFIG,
_LT_AC_LANG_CXX_CONFIG, AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE,
AC_LIBTOOL_PROG_LD_SHLIBS):
egrep -> grep, when that makes no difference.
* libtoolize.in: Likewise.
* ltdl.m4 (AC_LTDL_SYMBOL_USCORE): Likewise.
* ltmain.in: Likewise.
* demo/Makefile.am (hc-direct): Likewise.
* pdemo/Makefile.am (hc-direct): Likewise.
* tests/build-relink.test, tests/build-relink2.test,
tests/cdemo-conf.test, tests/cdemo-shared.test,
tests/cdemo-static.test, tests/demo-conf.test,
tests/demo-nofast.test, tests/demo-shared.test,
tests/demo-static.test, tests/depdemo-conf.test,
tests/depdemo-nofast.test, tests/depdemo-shared.test,
tests/depdemo-static.test, tests/hardcode.test,
tests/mdemo-conf.test, tests/mdemo-shared.test,
tests/mdemo-static.test, tests/pdemo-conf.test,
tests/tagdemo-conf.test, tests/tagdemo-shared.test,
tests/tagdemo-static.test: Likewise.
* libtool.m4 (AC_PROG_EGREP):
New macro, defined if Autoconf doesn't define.
(AC_PATH_TOOL_PREFIX, AC_PROG_LD_GNU): Use it.
(AC_PROG_LD, AC_PROG_NM, AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE):
Use shell pattern matching rather than egrep.
(AC_LIBTOOL_CONFIG): Set lt_EGREP and EGREP.
* demo/Makefile.am (SET_HARDCODE_FLAGS): Use sed instead of egrep.
* pdemo/Makefile.am (SET_HARDCODE_FLAGS): Likewise.
* tests/defs (EGREP, FGREP): New vars.
* ltmain.in: egrep -> $EGREP
* tests/assign.test, tests/demo-exec.test, tests/demo-inst.test,
tests/pdemo-exec.test, tests/pdemo-inst.test, tests/sh.test:
Likewise.
* tests/hardcode.test: fgrep -> $FGREP
* tests/f77demo-exec.test: test -a -> test &&
2002-11-19 17:42:39 +08:00
|
|
|
a_deplib=""
|
|
|
|
;;
|
|
|
|
esac
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
fi
|
|
|
|
if test -n "$a_deplib" ; then
|
|
|
|
libname=`eval \\$echo \"$libname_spec\"`
|
|
|
|
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
|
|
|
|
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
|
|
|
|
for potent_lib in $potential_libs; do
|
|
|
|
potlib="$potent_lib" # see symlink-check above in file_magic test
|
2004-02-13 07:47:46 +08:00
|
|
|
if eval $echo \"$potent_lib\" 2>/dev/null |
|
|
|
|
${SED} 10q |
|
|
|
|
$EGREP "$match_pattern_regex" > /dev/null; then
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
newdeplibs="$newdeplibs $a_deplib"
|
|
|
|
a_deplib=""
|
|
|
|
break 2
|
|
|
|
fi
|
|
|
|
done
|
2001-04-07 05:29:15 +08:00
|
|
|
done
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
fi
|
2001-04-07 05:29:15 +08:00
|
|
|
if test -n "$a_deplib" ; then
|
|
|
|
droppeddeps=yes
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo
|
|
|
|
$echo "*** Warning: linker path does not have real file for library $a_deplib."
|
|
|
|
$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"
|
|
|
|
$echo "*** because I did check the linker path looking for a file starting"
|
2001-08-05 19:29:09 +08:00
|
|
|
if test -z "$potlib" ; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "*** with $libname but no candidates were found. (...for regex pattern test)"
|
2001-08-05 19:29:09 +08:00
|
|
|
else
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "*** with $libname and none of the candidates passed a file format test"
|
|
|
|
$echo "*** using a regex pattern. Last file checked: $potlib"
|
2001-08-05 19:29:09 +08:00
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
|
|
|
else
|
|
|
|
# Add a -L argument.
|
|
|
|
newdeplibs="$newdeplibs $a_deplib"
|
|
|
|
fi
|
|
|
|
done # Gone through all deplibs.
|
|
|
|
;;
|
|
|
|
none | unknown | *)
|
|
|
|
newdeplibs=""
|
2004-02-13 09:57:52 +08:00
|
|
|
tmp_deplibs=`$echo "X $deplibs" | $Xsed \
|
|
|
|
-e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
|
* libtool.m4 (_LT_AC_LOCK): remove support for ancient
versions of mingw and cygwin.
(AC_LIBTOOL_POSTDEP_PREDEP): new function.
moved the "find hidden library dependencies" code here
from AC_LIBTOOL_LANG_CXX_CONFIG. Attempted to make it
multi-tag compatible, but currently only CXX calls it.
(AC_LIBTOOL_LANG_CXX_CONFIG): set
enable_shared_with_satic_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32. Replace
"find hidden library dependencies" code with a call
to the new function AC_LIBTOOL_POSTDEP_PREDEP.
Consolidate cygwin and mingw/pw32 stanzas.
(AC_LIBTOOL_LANG_F77_CONFIG): set
enable_shared_with_static_runtimes to 'no' by default
(AC_LIBTOOL_CONFIG): add
enable_shared_with_static_runtimes to the list of variables
to write into ltmain.sh; include it in the libtool script
template as allow_libtool_libs_with_static_runtimes.
(AC_LIBTOOL_PROG_LD_SHLIBS): set
enable_shared_with_static_runtimes to 'no' by default
Set it to 'yes' for cygwin, mingw, pw32.
(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE): only put cr in regexp
if the build_os is mingw, not host_os
* ltmain.in (case deplibs_check_method): for all appropriate
cases, if allow_libtool_libs_with_static_runtimes, then remove
predeps and postdeps from the list of dependencies that must
be checked for "dynamicness". For the "none" case, the
presence of compiler-generated postdeps and predeps should
not trigger "inter-library dependencies not supported" error.
(initial setup after arg processing): on cygwin/mingw, allow
compiler-generated dependent libs to be duplicated without
elimination.
(initial search loop for deplibs): if the deplib in question
is a libtool lib, then if
allow_libtool_libs_with_static_runtimes then parse the .la file.
If the .la file only has an "old_library", add the deplib
directly to the deplibs list (-lstdc++) and DON'T use the .la
file; this allows the (case deplibs_check_method) change above
to take effect.
* ltmain.in (for pass in $passes loop): remove predeps,
postdeps, and compiler_lib_search_path from dependency_libs.
2002-11-18 23:26:17 +08:00
|
|
|
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
|
|
|
for i in $predeps $postdeps ; do
|
|
|
|
# can't use Xsed below, because $i might contain '/'
|
|
|
|
tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
|
|
|
|
done
|
|
|
|
fi
|
2004-02-13 07:47:46 +08:00
|
|
|
if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
|
|
|
|
$GREP . >/dev/null; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo
|
2000-01-20 04:34:37 +08:00
|
|
|
if test "X$deplibs_check_method" = "Xnone"; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "*** Warning: inter-library dependencies are not supported in this platform."
|
2000-01-20 04:34:37 +08:00
|
|
|
else
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "*** Warning: inter-library dependencies are not known to be supported."
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "*** All declared inter-library dependencies are being dropped."
|
2000-01-20 04:34:37 +08:00
|
|
|
droppeddeps=yes
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
2000-01-20 04:34:37 +08:00
|
|
|
versuffix=$versuffix_save
|
|
|
|
major=$major_save
|
|
|
|
release=$release_save
|
|
|
|
libname=$libname_save
|
|
|
|
name=$name_save
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2001-04-25 04:30:21 +08:00
|
|
|
case $host in
|
|
|
|
*-*-rhapsody* | *-*-darwin1.[012])
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
# On Rhapsody replace the C library with the System framework
|
2004-01-19 12:57:26 +08:00
|
|
|
newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
|
2001-04-25 04:30:21 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test "$droppeddeps" = yes; then
|
|
|
|
if test "$module" = yes; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo
|
|
|
|
$echo "*** Warning: libtool could not satisfy all declared inter-library"
|
|
|
|
$echo "*** dependencies of module $libname. Therefore, libtool will create"
|
|
|
|
$echo "*** a static module, that should work as long as the dlopening"
|
|
|
|
$echo "*** application is linked with the -dlopen flag."
|
1999-10-30 18:39:28 +08:00
|
|
|
if test -z "$global_symbol_pipe"; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo
|
|
|
|
$echo "*** However, this would only work if libtool was able to extract symbol"
|
|
|
|
$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
|
|
|
|
$echo "*** not find such a program. So, this module is probably useless."
|
|
|
|
$echo "*** \`nm' from GNU binutils and a full rebuild may help."
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
if test "$build_old_libs" = no; then
|
|
|
|
oldlibs="$output_objdir/$libname.$libext"
|
|
|
|
build_libtool_libs=module
|
|
|
|
build_old_libs=yes
|
|
|
|
else
|
|
|
|
build_libtool_libs=no
|
|
|
|
fi
|
|
|
|
else
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "*** The inter-library dependencies that have been dropped here will be"
|
|
|
|
$echo "*** automatically added whenever a program is linked with this library"
|
|
|
|
$echo "*** or is declared to -dlopen it."
|
2001-03-06 19:16:05 +08:00
|
|
|
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$allow_undefined" = no; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo
|
|
|
|
$echo "*** Since this library must not contain undefined symbols,"
|
|
|
|
$echo "*** because either the platform does not support them or"
|
|
|
|
$echo "*** it was explicitly requested with -no-undefined,"
|
|
|
|
$echo "*** libtool will only create a static version of it."
|
2001-03-06 19:16:05 +08:00
|
|
|
if test "$build_old_libs" = no; then
|
|
|
|
oldlibs="$output_objdir/$libname.$libext"
|
|
|
|
build_libtool_libs=module
|
|
|
|
build_old_libs=yes
|
|
|
|
else
|
|
|
|
build_libtool_libs=no
|
|
|
|
fi
|
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
# Done checking deplibs!
|
|
|
|
deplibs=$newdeplibs
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
2004-06-21 22:52:57 +08:00
|
|
|
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
|
|
|
|
case $host in
|
|
|
|
*-*-darwin*)
|
|
|
|
newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
|
inherited_linker_flags=`$echo "X $inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
|
deplibs=`$echo "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
|
;;
|
|
|
|
esac
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# All the library-specific variables (install_libdir is set above).
|
|
|
|
library_names=
|
|
|
|
old_library=
|
|
|
|
dlname=
|
2000-01-25 04:34:46 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Test again, we may have decided not to build it any more
|
|
|
|
if test "$build_libtool_libs" = yes; then
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$hardcode_into_libs" = yes; then
|
2000-01-20 04:34:37 +08:00
|
|
|
# Hardcode the library paths
|
|
|
|
hardcode_libdirs=
|
|
|
|
dep_rpath=
|
|
|
|
rpath="$finalize_rpath"
|
|
|
|
test "$mode" != relink && rpath="$compile_rpath$rpath"
|
|
|
|
for libdir in $rpath; do
|
|
|
|
if test -n "$hardcode_libdir_flag_spec"; then
|
|
|
|
if test -n "$hardcode_libdir_separator"; then
|
|
|
|
if test -z "$hardcode_libdirs"; then
|
|
|
|
hardcode_libdirs="$libdir"
|
|
|
|
else
|
|
|
|
# Just accumulate the unique libdirs.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
|
2000-01-20 04:34:37 +08:00
|
|
|
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
eval flag=\"$hardcode_libdir_flag_spec\"
|
|
|
|
dep_rpath="$dep_rpath $flag"
|
|
|
|
fi
|
|
|
|
elif test -n "$runpath_var"; then
|
|
|
|
case "$perm_rpath " in
|
|
|
|
*" $libdir "*) ;;
|
|
|
|
*) perm_rpath="$perm_rpath $libdir" ;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
# Substitute the hardcoded libdirs into the rpath.
|
|
|
|
if test -n "$hardcode_libdir_separator" &&
|
|
|
|
test -n "$hardcode_libdirs"; then
|
|
|
|
libdir="$hardcode_libdirs"
|
2003-01-15 10:55:34 +08:00
|
|
|
if test -n "$hardcode_libdir_flag_spec_ld"; then
|
|
|
|
eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
|
|
|
|
else
|
|
|
|
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
|
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
|
|
|
if test -n "$runpath_var" && test -n "$perm_rpath"; then
|
|
|
|
# We should set the runpath_var.
|
|
|
|
rpath=
|
|
|
|
for dir in $perm_rpath; do
|
|
|
|
rpath="$rpath$dir:"
|
|
|
|
done
|
|
|
|
eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
|
|
|
|
fi
|
|
|
|
test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
2000-01-25 04:34:46 +08:00
|
|
|
shlibpath="$finalize_shlibpath"
|
|
|
|
test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
|
2000-01-20 04:34:37 +08:00
|
|
|
if test -n "$shlibpath"; then
|
|
|
|
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
2000-01-25 04:34:46 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Get the real and link names of the library.
|
2004-02-15 21:30:01 +08:00
|
|
|
eval shared_ext=\"$shrext_cmds\"
|
2000-01-20 04:34:37 +08:00
|
|
|
eval library_names=\"$library_names_spec\"
|
|
|
|
set dummy $library_names
|
|
|
|
realname="$2"
|
|
|
|
shift; shift
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test -n "$soname_spec"; then
|
|
|
|
eval soname=\"$soname_spec\"
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
2000-01-20 04:34:37 +08:00
|
|
|
soname="$realname"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
2001-07-30 00:20:45 +08:00
|
|
|
if test -z "$dlname"; then
|
2001-05-28 07:20:45 +08:00
|
|
|
dlname=$soname
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
lib="$output_objdir/$realname"
|
|
|
|
for link
|
|
|
|
do
|
|
|
|
linknames="$linknames $link"
|
|
|
|
done
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Use standard objects if they are pic
|
|
|
|
test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Prepare the list of exported symbols
|
|
|
|
if test -z "$export_symbols"; then
|
|
|
|
if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
|
|
|
|
$show "generating symbol list for \`$libname.la'"
|
|
|
|
export_symbols="$output_objdir/$libname.exp"
|
|
|
|
$run $rm $export_symbols
|
2003-11-22 22:03:35 +08:00
|
|
|
cmds=$export_symbols_cmds
|
2001-09-11 07:33:26 +08:00
|
|
|
save_ifs="$IFS"; IFS='~'
|
2000-01-20 04:34:37 +08:00
|
|
|
for cmd in $cmds; do
|
|
|
|
IFS="$save_ifs"
|
2003-11-22 22:03:35 +08:00
|
|
|
eval cmd=\"$cmd\"
|
2002-06-25 03:32:41 +08:00
|
|
|
if len=`expr "X$cmd" : ".*"` &&
|
|
|
|
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
|
2004-08-26 17:02:42 +08:00
|
|
|
$show "$cmd"
|
|
|
|
$run eval "$cmd" || exit $?
|
|
|
|
skipped_export=false
|
2002-06-25 03:32:41 +08:00
|
|
|
else
|
2004-08-26 17:02:42 +08:00
|
|
|
# The command line is too long to execute in one step.
|
|
|
|
$show "using reloadable object file for export list..."
|
|
|
|
skipped_export=:
|
2002-06-25 03:32:41 +08:00
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
done
|
|
|
|
IFS="$save_ifs"
|
|
|
|
if test -n "$export_symbols_regex"; then
|
Don't assume that egrep and fgrep exist. POSIX 1003.1-2001 no
longer requires them; you're supposed to use grep -E and grep -F
instead. Also, don't assume that "test -a" works, since POSIX
doesn't require it.
* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER, _LT_AC_LANG_C_CONFIG,
_LT_AC_LANG_CXX_CONFIG, AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE,
AC_LIBTOOL_PROG_LD_SHLIBS):
egrep -> grep, when that makes no difference.
* libtoolize.in: Likewise.
* ltdl.m4 (AC_LTDL_SYMBOL_USCORE): Likewise.
* ltmain.in: Likewise.
* demo/Makefile.am (hc-direct): Likewise.
* pdemo/Makefile.am (hc-direct): Likewise.
* tests/build-relink.test, tests/build-relink2.test,
tests/cdemo-conf.test, tests/cdemo-shared.test,
tests/cdemo-static.test, tests/demo-conf.test,
tests/demo-nofast.test, tests/demo-shared.test,
tests/demo-static.test, tests/depdemo-conf.test,
tests/depdemo-nofast.test, tests/depdemo-shared.test,
tests/depdemo-static.test, tests/hardcode.test,
tests/mdemo-conf.test, tests/mdemo-shared.test,
tests/mdemo-static.test, tests/pdemo-conf.test,
tests/tagdemo-conf.test, tests/tagdemo-shared.test,
tests/tagdemo-static.test: Likewise.
* libtool.m4 (AC_PROG_EGREP):
New macro, defined if Autoconf doesn't define.
(AC_PATH_TOOL_PREFIX, AC_PROG_LD_GNU): Use it.
(AC_PROG_LD, AC_PROG_NM, AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE):
Use shell pattern matching rather than egrep.
(AC_LIBTOOL_CONFIG): Set lt_EGREP and EGREP.
* demo/Makefile.am (SET_HARDCODE_FLAGS): Use sed instead of egrep.
* pdemo/Makefile.am (SET_HARDCODE_FLAGS): Likewise.
* tests/defs (EGREP, FGREP): New vars.
* ltmain.in: egrep -> $EGREP
* tests/assign.test, tests/demo-exec.test, tests/demo-inst.test,
tests/pdemo-exec.test, tests/pdemo-inst.test, tests/sh.test:
Likewise.
* tests/hardcode.test: fgrep -> $FGREP
* tests/f77demo-exec.test: test -a -> test &&
2002-11-19 17:42:39 +08:00
|
|
|
$show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
|
|
|
|
$run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
|
2000-01-20 04:34:37 +08:00
|
|
|
$show "$mv \"${export_symbols}T\" \"$export_symbols\""
|
|
|
|
$run eval '$mv "${export_symbols}T" "$export_symbols"'
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$export_symbols" && test -n "$include_expsyms"; then
|
|
|
|
$run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
|
|
|
|
fi
|
|
|
|
|
2003-03-21 04:24:21 +08:00
|
|
|
tmp_deplibs=
|
|
|
|
for test_deplib in $deplibs; do
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
case " $convenience " in
|
|
|
|
*" $test_deplib "*) ;;
|
|
|
|
*)
|
|
|
|
tmp_deplibs="$tmp_deplibs $test_deplib"
|
|
|
|
;;
|
|
|
|
esac
|
2003-03-21 04:24:21 +08:00
|
|
|
done
|
2003-09-10 16:40:42 +08:00
|
|
|
deplibs="$tmp_deplibs"
|
2003-03-21 04:24:21 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test -n "$convenience"; then
|
|
|
|
if test -n "$whole_archive_flag_spec"; then
|
2001-05-28 07:20:45 +08:00
|
|
|
save_libobjs=$libobjs
|
2000-01-20 04:34:37 +08:00
|
|
|
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
2000-01-20 04:34:37 +08:00
|
|
|
gentop="$output_objdir/${outputname}x"
|
|
|
|
generated="$generated $gentop"
|
1999-10-30 18:39:28 +08:00
|
|
|
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
func_extract_archives $gentop $convenience
|
|
|
|
libobjs="$libobjs $func_extract_archives_result"
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
|
|
|
|
eval flag=\"$thread_safe_flag_spec\"
|
|
|
|
linker_flags="$linker_flags $flag"
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Make a backup of the uninstalled library when relinking
|
2000-09-05 19:03:06 +08:00
|
|
|
if test "$mode" = relink; then
|
2000-01-20 04:34:37 +08:00
|
|
|
$run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Do each of the archive commands.
|
2003-03-21 04:24:21 +08:00
|
|
|
if test "$module" = yes && test -n "$module_cmds" ; then
|
|
|
|
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
|
2003-11-22 22:03:35 +08:00
|
|
|
eval test_cmds=\"$module_expsym_cmds\"
|
|
|
|
cmds=$module_expsym_cmds
|
2003-03-21 04:24:21 +08:00
|
|
|
else
|
2003-11-22 22:03:35 +08:00
|
|
|
eval test_cmds=\"$module_cmds\"
|
|
|
|
cmds=$module_cmds
|
2003-03-21 04:24:21 +08:00
|
|
|
fi
|
|
|
|
else
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
|
|
|
|
eval test_cmds=\"$archive_expsym_cmds\"
|
|
|
|
cmds=$archive_expsym_cmds
|
|
|
|
else
|
|
|
|
eval test_cmds=\"$archive_cmds\"
|
|
|
|
cmds=$archive_cmds
|
2003-03-21 04:24:21 +08:00
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
2001-05-28 07:20:45 +08:00
|
|
|
|
2003-11-22 22:03:35 +08:00
|
|
|
if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
|
2001-09-03 06:07:38 +08:00
|
|
|
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
|
|
|
|
:
|
|
|
|
else
|
2004-08-26 17:02:42 +08:00
|
|
|
# The command line is too long to link in one step, link piecewise
|
|
|
|
# or, if using GNU ld and skipped_export is not :, use a linker
|
|
|
|
# script.
|
2001-09-03 06:07:38 +08:00
|
|
|
$echo "creating reloadable object files..."
|
2001-05-28 07:20:45 +08:00
|
|
|
|
|
|
|
# Save the value of $output and $libobjs because we want to
|
|
|
|
# use them later. If we have whole_archive_flag_spec, we
|
|
|
|
# want to use save_libobjs as it was before
|
|
|
|
# whole_archive_flag_spec was expanded, because we can't
|
|
|
|
# assume the linker understands whole_archive_flag_spec.
|
|
|
|
# This may have to be revisited, in case too many
|
|
|
|
# convenience libraries get linked in and end up exceeding
|
|
|
|
# the spec.
|
|
|
|
if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
|
|
|
|
save_libobjs=$libobjs
|
|
|
|
fi
|
2001-09-03 06:07:38 +08:00
|
|
|
save_output=$output
|
2004-03-24 11:03:05 +08:00
|
|
|
output_la=`echo "$output" | $SED $basename`
|
2001-05-28 07:20:45 +08:00
|
|
|
|
|
|
|
# Clear the reloadable object creation command queue and
|
|
|
|
# initialize k to one.
|
2001-09-03 06:07:38 +08:00
|
|
|
test_cmds=
|
|
|
|
concat_cmds=
|
|
|
|
objlist=
|
|
|
|
delfiles=
|
|
|
|
last_robj=
|
|
|
|
k=1
|
2004-08-26 17:02:42 +08:00
|
|
|
|
|
|
|
if test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
|
|
|
|
output=${output_objdir}/${output_la}.lnk
|
|
|
|
$echo "creating GNU ld script: $output"
|
|
|
|
$echo 'INPUT (' > $output
|
|
|
|
for obj in $save_libobjs
|
|
|
|
do
|
|
|
|
$echo \""$obj"\" >> $output
|
|
|
|
done
|
|
|
|
$echo ')' >> $output
|
|
|
|
else
|
|
|
|
$echo "creating reloadable object files..."
|
|
|
|
output=$output_objdir/$output_la-${k}.$objext
|
|
|
|
# Loop over the list of objects to be linked.
|
|
|
|
for obj in $save_libobjs
|
|
|
|
do
|
|
|
|
eval test_cmds=\"$reload_cmds $objlist $last_robj\"
|
|
|
|
if test "X$objlist" = X ||
|
|
|
|
{ len=`expr "X$test_cmds" : ".*"` &&
|
|
|
|
test "$len" -le "$max_cmd_len"; }; then
|
|
|
|
objlist="$objlist $obj"
|
2001-09-03 06:07:38 +08:00
|
|
|
else
|
2004-08-26 17:02:42 +08:00
|
|
|
# The command $test_cmds is almost too long, add a
|
|
|
|
# command to the queue.
|
|
|
|
if test "$k" -eq 1 ; then
|
|
|
|
# The first file doesn't have a previous command to add.
|
|
|
|
eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
|
|
|
|
else
|
|
|
|
# All subsequent reloadable object files will link in
|
|
|
|
# the last one created.
|
|
|
|
eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
|
|
|
|
fi
|
|
|
|
last_robj=$output_objdir/$output_la-${k}.$objext
|
|
|
|
k=`expr $k + 1`
|
|
|
|
output=$output_objdir/$output_la-${k}.$objext
|
|
|
|
objlist=$obj
|
|
|
|
len=1
|
2001-09-03 06:07:38 +08:00
|
|
|
fi
|
2004-08-26 17:02:42 +08:00
|
|
|
done
|
|
|
|
# Handle the remaining objects by creating one last
|
|
|
|
# reloadable object file. All subsequent reloadable object
|
|
|
|
# files will link in the last one created.
|
|
|
|
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
|
|
|
|
eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
|
|
|
|
|
|
|
|
if ${skipped_export-false}; then
|
|
|
|
$show "generating symbol list for \`$libname.la'"
|
|
|
|
export_symbols="$output_objdir/$libname.exp"
|
|
|
|
$run $rm $export_symbols
|
|
|
|
libobjs=$output
|
|
|
|
# Append the command to create the export file.
|
|
|
|
eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
|
2001-09-03 06:07:38 +08:00
|
|
|
fi
|
2001-05-28 07:20:45 +08:00
|
|
|
|
2004-08-26 17:02:42 +08:00
|
|
|
# Set up a command to remove the reloadale object files
|
|
|
|
# after they are used.
|
|
|
|
i=0
|
|
|
|
while test "$i" -lt "$k"
|
|
|
|
do
|
|
|
|
i=`expr $i + 1`
|
|
|
|
delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
|
|
|
|
done
|
2001-05-28 07:20:45 +08:00
|
|
|
|
2004-08-26 17:02:42 +08:00
|
|
|
$echo "creating a temporary reloadable object file: $output"
|
2001-05-28 07:20:45 +08:00
|
|
|
|
2004-08-26 17:02:42 +08:00
|
|
|
# Loop through the commands generated above and execute them.
|
|
|
|
save_ifs="$IFS"; IFS='~'
|
|
|
|
for cmd in $concat_cmds; do
|
|
|
|
IFS="$save_ifs"
|
|
|
|
$show "$cmd"
|
|
|
|
$run eval "$cmd" || {
|
|
|
|
lt_exit=$?
|
2004-03-24 10:59:28 +08:00
|
|
|
|
2004-08-26 17:02:42 +08:00
|
|
|
# Restore the uninstalled library and exit
|
|
|
|
if test "$mode" = relink; then
|
|
|
|
$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
|
|
|
|
fi
|
2004-03-24 10:59:28 +08:00
|
|
|
|
2004-08-26 17:02:42 +08:00
|
|
|
exit $lt_exit
|
|
|
|
}
|
|
|
|
done
|
|
|
|
IFS="$save_ifs"
|
|
|
|
fi
|
2001-09-03 06:07:38 +08:00
|
|
|
|
|
|
|
libobjs=$output
|
2001-05-28 07:20:45 +08:00
|
|
|
# Restore the value of output.
|
2001-09-03 06:07:38 +08:00
|
|
|
output=$save_output
|
2001-05-28 07:20:45 +08:00
|
|
|
|
|
|
|
if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
|
|
|
|
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
|
|
|
|
fi
|
|
|
|
# Expand the library linking commands again to reset the
|
|
|
|
# value of $libobjs for piecewise linking.
|
|
|
|
|
|
|
|
# Do each of the archive commands.
|
2003-11-22 21:58:35 +08:00
|
|
|
if test "$module" = yes && test -n "$module_cmds" ; then
|
|
|
|
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
|
2003-11-22 22:03:35 +08:00
|
|
|
cmds=$module_expsym_cmds
|
2003-11-22 21:58:35 +08:00
|
|
|
else
|
2003-11-22 22:03:35 +08:00
|
|
|
cmds=$module_cmds
|
2003-11-22 21:58:35 +08:00
|
|
|
fi
|
|
|
|
else
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
|
|
|
|
cmds=$archive_expsym_cmds
|
|
|
|
else
|
|
|
|
cmds=$archive_cmds
|
2003-11-22 21:58:35 +08:00
|
|
|
fi
|
2001-09-03 06:07:38 +08:00
|
|
|
fi
|
2001-05-28 07:20:45 +08:00
|
|
|
|
|
|
|
# Append the command to remove the reloadable object files
|
|
|
|
# to the just-reset $cmds.
|
2003-11-22 22:03:35 +08:00
|
|
|
eval cmds=\"\$cmds~\$rm $delfiles\"
|
2001-09-03 06:07:38 +08:00
|
|
|
fi
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
|
2004-08-26 17:02:42 +08:00
|
|
|
# Add any objects from preloaded convenience libraries
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
if test -n "$dlprefiles"; then
|
|
|
|
gentop="$output_objdir/${outputname}x"
|
|
|
|
generated="$generated $gentop"
|
|
|
|
|
|
|
|
func_extract_archives $gentop $dlprefiles
|
|
|
|
libobjs="$libobjs $func_extract_archives_result"
|
|
|
|
fi
|
|
|
|
|
2001-09-11 07:33:26 +08:00
|
|
|
save_ifs="$IFS"; IFS='~'
|
2001-09-03 06:07:38 +08:00
|
|
|
for cmd in $cmds; do
|
|
|
|
IFS="$save_ifs"
|
2003-11-22 22:03:35 +08:00
|
|
|
eval cmd=\"$cmd\"
|
2001-09-03 06:07:38 +08:00
|
|
|
$show "$cmd"
|
2004-03-24 10:59:28 +08:00
|
|
|
$run eval "$cmd" || {
|
|
|
|
lt_exit=$?
|
|
|
|
|
|
|
|
# Restore the uninstalled library and exit
|
|
|
|
if test "$mode" = relink; then
|
|
|
|
$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
|
|
|
|
fi
|
|
|
|
|
|
|
|
exit $lt_exit
|
|
|
|
}
|
2001-09-03 06:07:38 +08:00
|
|
|
done
|
|
|
|
IFS="$save_ifs"
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Restore the uninstalled library and exit
|
2000-09-05 19:03:06 +08:00
|
|
|
if test "$mode" = relink; then
|
2004-03-24 10:59:28 +08:00
|
|
|
$run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv ${realname}U $realname)' || exit $?
|
|
|
|
|
|
|
|
if test -n "$convenience"; then
|
|
|
|
if test -z "$whole_archive_flag_spec"; then
|
|
|
|
$show "${rm}r $gentop"
|
|
|
|
$run ${rm}r "$gentop"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2004-05-18 00:41:23 +08:00
|
|
|
exit $EXIT_SUCCESS
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Create links to the real library.
|
|
|
|
for linkname in $linknames; do
|
|
|
|
if test "$realname" != "$linkname"; then
|
|
|
|
$show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
|
|
|
|
$run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# If -module or -export-dynamic was specified, set the dlname.
|
|
|
|
if test "$module" = yes || test "$export_dynamic" = yes; then
|
|
|
|
# On all known operating systems, these are identical.
|
|
|
|
dlname="$soname"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
|
|
|
;;
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
obj)
|
|
|
|
if test -n "$deplibs"; then
|
|
|
|
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
|
|
|
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test -n "$rpath"; then
|
|
|
|
$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test -n "$xrpath"; then
|
|
|
|
$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test -n "$vinfo"; then
|
|
|
|
$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$release"; then
|
|
|
|
$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
|
|
|
|
fi
|
|
|
|
|
2001-03-06 04:08:09 +08:00
|
|
|
case $output in
|
2000-01-20 04:34:37 +08:00
|
|
|
*.lo)
|
|
|
|
if test -n "$objs$old_deplibs"; then
|
|
|
|
$echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
libobj="$output"
|
|
|
|
obj=`$echo "X$output" | $Xsed -e "$lo2o"`
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
libobj=
|
|
|
|
obj="$output"
|
|
|
|
;;
|
|
|
|
esac
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Delete the old objects.
|
|
|
|
$run $rm $obj $libobj
|
|
|
|
|
|
|
|
# Objects from convenience libraries. This assumes
|
|
|
|
# single-version convenience libraries. Whenever we create
|
|
|
|
# different ones for PIC/non-PIC, this we'll have to duplicate
|
|
|
|
# the extraction.
|
|
|
|
reload_conv_objs=
|
|
|
|
gentop=
|
|
|
|
# reload_cmds runs $LD directly, so let us get rid of
|
|
|
|
# -Wl from whole_archive_flag_spec
|
2000-01-25 04:34:46 +08:00
|
|
|
wl=
|
2000-01-20 04:34:37 +08:00
|
|
|
|
|
|
|
if test -n "$convenience"; then
|
|
|
|
if test -n "$whole_archive_flag_spec"; then
|
|
|
|
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
2000-01-20 04:34:37 +08:00
|
|
|
gentop="$output_objdir/${obj}x"
|
|
|
|
generated="$generated $gentop"
|
|
|
|
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
func_extract_archives $gentop $convenience
|
|
|
|
reload_conv_objs="$reload_objs $func_extract_archives_result"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Create the old-style object.
|
|
|
|
reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
output="$obj"
|
2003-11-22 22:03:35 +08:00
|
|
|
cmds=$reload_cmds
|
2001-09-11 07:33:26 +08:00
|
|
|
save_ifs="$IFS"; IFS='~'
|
2000-01-20 04:34:37 +08:00
|
|
|
for cmd in $cmds; do
|
|
|
|
IFS="$save_ifs"
|
2003-11-22 22:03:35 +08:00
|
|
|
eval cmd=\"$cmd\"
|
2000-01-20 04:34:37 +08:00
|
|
|
$show "$cmd"
|
|
|
|
$run eval "$cmd" || exit $?
|
|
|
|
done
|
|
|
|
IFS="$save_ifs"
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Exit if we aren't doing a library object file.
|
|
|
|
if test -z "$libobj"; then
|
|
|
|
if test -n "$gentop"; then
|
|
|
|
$show "${rm}r $gentop"
|
|
|
|
$run ${rm}r $gentop
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_SUCCESS
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test "$build_libtool_libs" != yes; then
|
|
|
|
if test -n "$gentop"; then
|
|
|
|
$show "${rm}r $gentop"
|
|
|
|
$run ${rm}r $gentop
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
# Create an invalid libtool object if no PIC, so that we don't
|
|
|
|
# accidentally link it into a program.
|
2001-05-28 07:20:45 +08:00
|
|
|
# $show "echo timestamp > $libobj"
|
|
|
|
# $run eval "echo timestamp > $libobj" || exit $?
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_SUCCESS
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test -n "$pic_flag" || test "$pic_mode" != default; then
|
|
|
|
# Only do commands if we really have different PIC objects.
|
|
|
|
reload_objs="$libobjs $reload_conv_objs"
|
|
|
|
output="$libobj"
|
2003-11-22 22:03:35 +08:00
|
|
|
cmds=$reload_cmds
|
2001-09-11 07:33:26 +08:00
|
|
|
save_ifs="$IFS"; IFS='~'
|
2000-01-20 04:34:37 +08:00
|
|
|
for cmd in $cmds; do
|
|
|
|
IFS="$save_ifs"
|
2003-11-22 22:03:35 +08:00
|
|
|
eval cmd=\"$cmd\"
|
2000-01-20 04:34:37 +08:00
|
|
|
$show "$cmd"
|
|
|
|
$run eval "$cmd" || exit $?
|
|
|
|
done
|
|
|
|
IFS="$save_ifs"
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test -n "$gentop"; then
|
|
|
|
$show "${rm}r $gentop"
|
|
|
|
$run ${rm}r $gentop
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_SUCCESS
|
2000-01-20 04:34:37 +08:00
|
|
|
;;
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
prog)
|
2001-03-31 08:08:03 +08:00
|
|
|
case $host in
|
2003-03-21 04:24:21 +08:00
|
|
|
*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
|
2001-03-31 08:08:03 +08:00
|
|
|
esac
|
2000-01-20 04:34:37 +08:00
|
|
|
if test -n "$vinfo"; then
|
|
|
|
$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test -n "$release"; then
|
|
|
|
$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-01-20 04:34:37 +08:00
|
|
|
if test "$preload" = yes; then
|
2000-02-02 00:43:34 +08:00
|
|
|
if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
|
2000-01-20 04:34:37 +08:00
|
|
|
test "$dlopen_self_static" = unknown; then
|
|
|
|
$echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
|
2000-01-25 04:34:46 +08:00
|
|
|
fi
|
2000-01-20 04:34:37 +08:00
|
|
|
fi
|
2000-01-25 04:34:46 +08:00
|
|
|
|
2001-04-25 04:30:21 +08:00
|
|
|
case $host in
|
|
|
|
*-*-rhapsody* | *-*-darwin1.[012])
|
|
|
|
# On Rhapsody replace the C library is the System framework
|
2004-01-19 12:57:26 +08:00
|
|
|
compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
|
|
|
|
finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
|
2001-04-25 04:30:21 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2003-01-01 09:57:47 +08:00
|
|
|
case $host in
|
2003-09-10 16:40:42 +08:00
|
|
|
*-*-darwin*)
|
2004-08-26 17:02:42 +08:00
|
|
|
# Don't allow lazy linking, it breaks C++ global constructors
|
|
|
|
if test "$tagname" = CXX ; then
|
|
|
|
compile_command="$compile_command ${wl}-bind_at_load"
|
|
|
|
finalize_command="$finalize_command ${wl}-bind_at_load"
|
|
|
|
fi
|
2004-01-19 12:57:26 +08:00
|
|
|
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
|
|
|
|
compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
|
|
|
|
finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
|
2004-08-26 17:02:42 +08:00
|
|
|
;;
|
2003-01-01 09:57:47 +08:00
|
|
|
esac
|
|
|
|
|
2000-02-24 07:10:05 +08:00
|
|
|
compile_command="$compile_command $compile_deplibs"
|
|
|
|
finalize_command="$finalize_command $finalize_deplibs"
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
if test -n "$rpath$xrpath"; then
|
|
|
|
# If the user specified any rpath flags, then add them.
|
|
|
|
for libdir in $rpath $xrpath; do
|
|
|
|
# This is the magic to use -rpath.
|
|
|
|
case "$finalize_rpath " in
|
|
|
|
*" $libdir "*) ;;
|
|
|
|
*) finalize_rpath="$finalize_rpath $libdir" ;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Now hardcode the library paths
|
|
|
|
rpath=
|
|
|
|
hardcode_libdirs=
|
|
|
|
for libdir in $compile_rpath $finalize_rpath; do
|
|
|
|
if test -n "$hardcode_libdir_flag_spec"; then
|
|
|
|
if test -n "$hardcode_libdir_separator"; then
|
|
|
|
if test -z "$hardcode_libdirs"; then
|
|
|
|
hardcode_libdirs="$libdir"
|
|
|
|
else
|
|
|
|
# Just accumulate the unique libdirs.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
|
1999-10-30 18:39:28 +08:00
|
|
|
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
eval flag=\"$hardcode_libdir_flag_spec\"
|
|
|
|
rpath="$rpath $flag"
|
|
|
|
fi
|
|
|
|
elif test -n "$runpath_var"; then
|
|
|
|
case "$perm_rpath " in
|
|
|
|
*" $libdir "*) ;;
|
|
|
|
*) perm_rpath="$perm_rpath $libdir" ;;
|
|
|
|
esac
|
|
|
|
fi
|
2001-03-06 04:08:09 +08:00
|
|
|
case $host in
|
2000-09-15 10:10:27 +08:00
|
|
|
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
|
2001-03-06 04:08:09 +08:00
|
|
|
case :$dllsearchpath: in
|
1999-10-30 18:39:28 +08:00
|
|
|
*":$libdir:"*) ;;
|
|
|
|
*) dllsearchpath="$dllsearchpath:$libdir";;
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
# Substitute the hardcoded libdirs into the rpath.
|
|
|
|
if test -n "$hardcode_libdir_separator" &&
|
|
|
|
test -n "$hardcode_libdirs"; then
|
|
|
|
libdir="$hardcode_libdirs"
|
|
|
|
eval rpath=\" $hardcode_libdir_flag_spec\"
|
|
|
|
fi
|
|
|
|
compile_rpath="$rpath"
|
|
|
|
|
|
|
|
rpath=
|
|
|
|
hardcode_libdirs=
|
|
|
|
for libdir in $finalize_rpath; do
|
|
|
|
if test -n "$hardcode_libdir_flag_spec"; then
|
|
|
|
if test -n "$hardcode_libdir_separator"; then
|
|
|
|
if test -z "$hardcode_libdirs"; then
|
|
|
|
hardcode_libdirs="$libdir"
|
|
|
|
else
|
|
|
|
# Just accumulate the unique libdirs.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
|
1999-10-30 18:39:28 +08:00
|
|
|
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
eval flag=\"$hardcode_libdir_flag_spec\"
|
|
|
|
rpath="$rpath $flag"
|
|
|
|
fi
|
|
|
|
elif test -n "$runpath_var"; then
|
|
|
|
case "$finalize_perm_rpath " in
|
|
|
|
*" $libdir "*) ;;
|
|
|
|
*) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
# Substitute the hardcoded libdirs into the rpath.
|
|
|
|
if test -n "$hardcode_libdir_separator" &&
|
|
|
|
test -n "$hardcode_libdirs"; then
|
|
|
|
libdir="$hardcode_libdirs"
|
|
|
|
eval rpath=\" $hardcode_libdir_flag_spec\"
|
|
|
|
fi
|
|
|
|
finalize_rpath="$rpath"
|
|
|
|
|
|
|
|
if test -n "$libobjs" && test "$build_old_libs" = yes; then
|
|
|
|
# Transform all the library objects into standard objects.
|
|
|
|
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
|
|
|
|
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
|
|
|
|
fi
|
|
|
|
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
|
1999-10-30 18:39:28 +08:00
|
|
|
# Replace the output file specification.
|
|
|
|
compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
|
|
|
|
link_command="$compile_command$compile_rpath"
|
|
|
|
|
|
|
|
# We have no uninstalled library dependencies, so finalize right now.
|
|
|
|
$show "$link_command"
|
|
|
|
$run eval "$link_command"
|
|
|
|
status=$?
|
2000-01-25 04:34:46 +08:00
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# Delete the generated files.
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
if test -f "$output_objdir/${outputname}S.${objext}"; then
|
1999-10-30 18:39:28 +08:00
|
|
|
$show "$rm $output_objdir/${outputname}S.${objext}"
|
|
|
|
$run $rm "$output_objdir/${outputname}S.${objext}"
|
|
|
|
fi
|
|
|
|
|
|
|
|
exit $status
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$shlibpath_var"; then
|
|
|
|
# We should set the shlibpath_var
|
|
|
|
rpath=
|
|
|
|
for dir in $temp_rpath; do
|
2001-03-06 04:08:09 +08:00
|
|
|
case $dir in
|
1999-10-30 18:39:28 +08:00
|
|
|
[\\/]* | [A-Za-z]:[\\/]*)
|
|
|
|
# Absolute path.
|
|
|
|
rpath="$rpath$dir:"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
# Relative path: add a thisdir entry.
|
|
|
|
rpath="$rpath\$thisdir/$dir:"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
temp_rpath="$rpath"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$compile_shlibpath$finalize_shlibpath"; then
|
|
|
|
compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
|
|
|
|
fi
|
|
|
|
if test -n "$finalize_shlibpath"; then
|
|
|
|
finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
|
|
|
|
fi
|
|
|
|
|
|
|
|
compile_var=
|
|
|
|
finalize_var=
|
|
|
|
if test -n "$runpath_var"; then
|
|
|
|
if test -n "$perm_rpath"; then
|
|
|
|
# We should set the runpath_var.
|
|
|
|
rpath=
|
|
|
|
for dir in $perm_rpath; do
|
|
|
|
rpath="$rpath$dir:"
|
|
|
|
done
|
|
|
|
compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
|
|
|
|
fi
|
|
|
|
if test -n "$finalize_perm_rpath"; then
|
|
|
|
# We should set the runpath_var.
|
|
|
|
rpath=
|
|
|
|
for dir in $finalize_perm_rpath; do
|
|
|
|
rpath="$rpath$dir:"
|
|
|
|
done
|
|
|
|
finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "$no_install" = yes; then
|
|
|
|
# We don't need to create a wrapper script.
|
|
|
|
link_command="$compile_var$compile_command$compile_rpath"
|
|
|
|
# Replace the output file specification.
|
|
|
|
link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
|
|
|
|
# Delete the old output file.
|
|
|
|
$run $rm $output
|
|
|
|
# Link the executable and exit
|
|
|
|
$show "$link_command"
|
|
|
|
$run eval "$link_command" || exit $?
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_SUCCESS
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
2000-09-05 19:03:06 +08:00
|
|
|
if test "$hardcode_action" = relink; then
|
1999-10-30 18:39:28 +08:00
|
|
|
# Fast installation is not supported
|
|
|
|
link_command="$compile_var$compile_command$compile_rpath"
|
|
|
|
relink_command="$finalize_var$finalize_command$finalize_rpath"
|
2000-01-25 04:34:46 +08:00
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
|
|
|
|
$echo "$modename: \`$output' will be relinked during installation" 1>&2
|
|
|
|
else
|
|
|
|
if test "$fast_install" != no; then
|
|
|
|
link_command="$finalize_var$compile_command$finalize_rpath"
|
|
|
|
if test "$fast_install" = yes; then
|
|
|
|
relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
|
|
|
|
else
|
|
|
|
# fast_install is set to needless
|
|
|
|
relink_command=
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
link_command="$compile_var$compile_command$compile_rpath"
|
|
|
|
relink_command="$finalize_var$finalize_command$finalize_rpath"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Replace the output file specification.
|
|
|
|
link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
|
2000-01-25 04:34:46 +08:00
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# Delete the old output files.
|
|
|
|
$run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
|
|
|
|
|
|
|
|
$show "$link_command"
|
|
|
|
$run eval "$link_command" || exit $?
|
|
|
|
|
|
|
|
# Now create the wrapper script.
|
|
|
|
$show "creating $output"
|
|
|
|
|
|
|
|
# Quote the relink command for shipping.
|
|
|
|
if test -n "$relink_command"; then
|
2000-03-27 07:01:20 +08:00
|
|
|
# Preserve any variables that may affect compiler behavior
|
2000-03-21 20:39:33 +08:00
|
|
|
for var in $variables_saved_for_relink; do
|
2000-09-03 11:13:56 +08:00
|
|
|
if eval test -z \"\${$var+set}\"; then
|
|
|
|
relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
|
|
|
|
elif eval var_value=\$$var; test -z "$var_value"; then
|
|
|
|
relink_command="$var=; export $var; $relink_command"
|
|
|
|
else
|
|
|
|
var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
|
|
|
|
relink_command="$var=\"$var_value\"; export $var; $relink_command"
|
|
|
|
fi
|
2000-03-21 20:39:33 +08:00
|
|
|
done
|
2001-11-15 08:59:07 +08:00
|
|
|
relink_command="(cd `pwd`; $relink_command)"
|
1999-10-30 18:39:28 +08:00
|
|
|
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Quote $echo for shipping.
|
2004-02-12 20:27:46 +08:00
|
|
|
if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
|
|
|
|
case $progpath in
|
|
|
|
[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
|
|
|
|
*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
|
1999-10-30 18:39:28 +08:00
|
|
|
esac
|
|
|
|
qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
|
|
|
|
else
|
|
|
|
qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Only actually do things if our run command is non-null.
|
|
|
|
if test -z "$run"; then
|
|
|
|
# win32 will think the script is a binary if it has
|
|
|
|
# a .exe suffix, so we strip it off here.
|
|
|
|
case $output in
|
2003-03-21 04:24:21 +08:00
|
|
|
*.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
|
1999-10-30 18:39:28 +08:00
|
|
|
esac
|
2001-03-31 08:08:03 +08:00
|
|
|
# test for cygwin because mv fails w/o .exe extensions
|
|
|
|
case $host in
|
2002-03-03 11:19:55 +08:00
|
|
|
*cygwin*)
|
|
|
|
exeext=.exe
|
2003-03-21 04:24:21 +08:00
|
|
|
outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
|
2001-03-31 08:08:03 +08:00
|
|
|
*) exeext= ;;
|
|
|
|
esac
|
2003-01-29 12:53:18 +08:00
|
|
|
case $host in
|
|
|
|
*cygwin* | *mingw* )
|
2003-03-21 04:24:21 +08:00
|
|
|
cwrappersource=`$echo ${objdir}/lt-${output}.c`
|
|
|
|
cwrapper=`$echo ${output}.exe`
|
2003-01-29 12:53:18 +08:00
|
|
|
$rm $cwrappersource $cwrapper
|
2004-02-12 20:27:46 +08:00
|
|
|
trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
|
2003-01-29 12:53:18 +08:00
|
|
|
|
|
|
|
cat > $cwrappersource <<EOF
|
|
|
|
|
|
|
|
/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
|
2003-11-26 20:34:23 +08:00
|
|
|
Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
|
2003-01-29 12:53:18 +08:00
|
|
|
|
|
|
|
The $output program cannot be directly executed until all the libtool
|
|
|
|
libraries that it depends on are installed.
|
2003-09-10 16:40:42 +08:00
|
|
|
|
2003-01-29 12:53:18 +08:00
|
|
|
This wrapper executable should never be moved out of the build directory.
|
|
|
|
If it is, it will not operate correctly.
|
|
|
|
|
|
|
|
Currently, it simply execs the wrapper *script* "/bin/sh $output",
|
|
|
|
but could eventually absorb all of the scripts functionality and
|
|
|
|
exec $objdir/$outputname directly.
|
|
|
|
*/
|
|
|
|
EOF
|
|
|
|
cat >> $cwrappersource<<"EOF"
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <malloc.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <assert.h>
|
2003-11-06 22:21:15 +08:00
|
|
|
#include <sys/stat.h>
|
2003-01-29 12:53:18 +08:00
|
|
|
|
|
|
|
#if defined(PATH_MAX)
|
|
|
|
# define LT_PATHMAX PATH_MAX
|
|
|
|
#elif defined(MAXPATHLEN)
|
|
|
|
# define LT_PATHMAX MAXPATHLEN
|
|
|
|
#else
|
|
|
|
# define LT_PATHMAX 1024
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef DIR_SEPARATOR
|
2003-11-06 22:21:15 +08:00
|
|
|
# define DIR_SEPARATOR '/'
|
|
|
|
# define PATH_SEPARATOR ':'
|
2003-01-29 12:53:18 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
|
|
|
|
defined (__OS2__)
|
2003-11-06 22:21:15 +08:00
|
|
|
# define HAVE_DOS_BASED_FILE_SYSTEM
|
2004-01-07 03:26:17 +08:00
|
|
|
# ifndef DIR_SEPARATOR_2
|
2003-11-06 22:21:15 +08:00
|
|
|
# define DIR_SEPARATOR_2 '\\'
|
|
|
|
# endif
|
2004-01-07 03:26:17 +08:00
|
|
|
# ifndef PATH_SEPARATOR_2
|
2003-11-06 22:21:15 +08:00
|
|
|
# define PATH_SEPARATOR_2 ';'
|
|
|
|
# endif
|
2003-01-29 12:53:18 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef DIR_SEPARATOR_2
|
|
|
|
# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
|
|
|
|
#else /* DIR_SEPARATOR_2 */
|
|
|
|
# define IS_DIR_SEPARATOR(ch) \
|
2004-08-26 17:02:42 +08:00
|
|
|
(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
|
2003-01-29 12:53:18 +08:00
|
|
|
#endif /* DIR_SEPARATOR_2 */
|
|
|
|
|
2003-11-06 22:21:15 +08:00
|
|
|
#ifndef PATH_SEPARATOR_2
|
|
|
|
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
|
|
|
|
#else /* PATH_SEPARATOR_2 */
|
|
|
|
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
|
|
|
|
#endif /* PATH_SEPARATOR_2 */
|
|
|
|
|
2003-01-29 12:53:18 +08:00
|
|
|
#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
|
|
|
|
#define XFREE(stale) do { \
|
|
|
|
if (stale) { free ((void *) stale); stale = 0; } \
|
|
|
|
} while (0)
|
|
|
|
|
2003-11-06 22:21:15 +08:00
|
|
|
#if defined DEBUGWRAPPER
|
|
|
|
# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
|
|
|
|
#else
|
2004-01-07 03:26:17 +08:00
|
|
|
# define DEBUG(format, ...)
|
2003-11-06 22:21:15 +08:00
|
|
|
#endif
|
|
|
|
|
2003-01-29 12:53:18 +08:00
|
|
|
const char *program_name = NULL;
|
|
|
|
|
|
|
|
void * xmalloc (size_t num);
|
|
|
|
char * xstrdup (const char *string);
|
|
|
|
char * basename (const char *name);
|
2003-11-06 22:21:15 +08:00
|
|
|
char * find_executable(const char *wrapper);
|
|
|
|
int check_executable(const char *path);
|
2003-01-29 12:53:18 +08:00
|
|
|
char * strendzap(char *str, const char *pat);
|
|
|
|
void lt_fatal (const char *message, ...);
|
|
|
|
|
|
|
|
int
|
|
|
|
main (int argc, char *argv[])
|
|
|
|
{
|
|
|
|
char **newargz;
|
|
|
|
int i;
|
2003-09-10 16:40:42 +08:00
|
|
|
|
2003-01-29 12:53:18 +08:00
|
|
|
program_name = (char *) xstrdup ((char *) basename (argv[0]));
|
2003-11-06 22:21:15 +08:00
|
|
|
DEBUG("(main) argv[0] : %s\n",argv[0]);
|
|
|
|
DEBUG("(main) program_name : %s\n",program_name);
|
2003-01-29 12:53:18 +08:00
|
|
|
newargz = XMALLOC(char *, argc+2);
|
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >> $cwrappersource <<EOF
|
|
|
|
newargz[0] = "$SHELL";
|
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >> $cwrappersource <<"EOF"
|
2003-11-06 22:21:15 +08:00
|
|
|
newargz[1] = find_executable(argv[0]);
|
|
|
|
if (newargz[1] == NULL)
|
|
|
|
lt_fatal("Couldn't find %s", argv[0]);
|
|
|
|
DEBUG("(main) found exe at : %s\n",newargz[1]);
|
2003-01-29 12:53:18 +08:00
|
|
|
/* we know the script has the same name, without the .exe */
|
|
|
|
/* so make sure newargz[1] doesn't end in .exe */
|
2003-09-10 16:40:42 +08:00
|
|
|
strendzap(newargz[1],".exe");
|
2003-01-29 12:53:18 +08:00
|
|
|
for (i = 1; i < argc; i++)
|
|
|
|
newargz[i+1] = xstrdup(argv[i]);
|
|
|
|
newargz[argc+1] = NULL;
|
2003-11-06 22:21:15 +08:00
|
|
|
|
|
|
|
for (i=0; i<argc+1; i++)
|
|
|
|
{
|
|
|
|
DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]);
|
|
|
|
;
|
|
|
|
}
|
|
|
|
|
2003-01-29 12:53:18 +08:00
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >> $cwrappersource <<EOF
|
|
|
|
execv("$SHELL",newargz);
|
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >> $cwrappersource <<"EOF"
|
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
|
|
|
xmalloc (size_t num)
|
|
|
|
{
|
|
|
|
void * p = (void *) malloc (num);
|
|
|
|
if (!p)
|
|
|
|
lt_fatal ("Memory exhausted");
|
|
|
|
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2003-09-10 16:40:42 +08:00
|
|
|
char *
|
2003-01-29 12:53:18 +08:00
|
|
|
xstrdup (const char *string)
|
|
|
|
{
|
|
|
|
return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
|
|
|
|
;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
|
|
|
basename (const char *name)
|
|
|
|
{
|
|
|
|
const char *base;
|
|
|
|
|
|
|
|
#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
|
|
|
|
/* Skip over the disk name in MSDOS pathnames. */
|
2003-09-10 16:40:42 +08:00
|
|
|
if (isalpha (name[0]) && name[1] == ':')
|
2003-01-29 12:53:18 +08:00
|
|
|
name += 2;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
for (base = name; *name; name++)
|
|
|
|
if (IS_DIR_SEPARATOR (*name))
|
|
|
|
base = name + 1;
|
|
|
|
return (char *) base;
|
|
|
|
}
|
|
|
|
|
2003-11-06 22:21:15 +08:00
|
|
|
int
|
|
|
|
check_executable(const char * path)
|
|
|
|
{
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
|
|
|
|
if ((!path) || (!*path))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if ((stat (path, &st) >= 0) &&
|
2004-05-22 06:27:07 +08:00
|
|
|
(
|
2004-08-26 17:02:42 +08:00
|
|
|
/* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
|
2004-05-22 06:27:07 +08:00
|
|
|
#if defined (S_IXOTH)
|
|
|
|
((st.st_mode & S_IXOTH) == S_IXOTH) ||
|
|
|
|
#endif
|
|
|
|
#if defined (S_IXGRP)
|
2003-11-06 22:21:15 +08:00
|
|
|
((st.st_mode & S_IXGRP) == S_IXGRP) ||
|
2004-05-22 06:27:07 +08:00
|
|
|
#endif
|
|
|
|
((st.st_mode & S_IXUSR) == S_IXUSR))
|
|
|
|
)
|
2003-11-06 22:21:15 +08:00
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Searches for the full path of the wrapper. Returns
|
|
|
|
newly allocated full path name if found, NULL otherwise */
|
2003-09-10 16:40:42 +08:00
|
|
|
char *
|
2003-11-06 22:21:15 +08:00
|
|
|
find_executable (const char* wrapper)
|
2003-01-29 12:53:18 +08:00
|
|
|
{
|
2003-11-06 22:21:15 +08:00
|
|
|
int has_slash = 0;
|
|
|
|
const char* p;
|
|
|
|
const char* p_next;
|
|
|
|
struct stat st;
|
|
|
|
/* static buffer for getcwd */
|
2003-01-29 12:53:18 +08:00
|
|
|
char tmp[LT_PATHMAX + 1];
|
2003-11-06 22:21:15 +08:00
|
|
|
int tmp_len;
|
|
|
|
char* concat_name;
|
2003-01-29 12:53:18 +08:00
|
|
|
|
2003-11-06 22:21:15 +08:00
|
|
|
DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
|
2004-01-07 03:26:17 +08:00
|
|
|
|
2003-11-06 22:21:15 +08:00
|
|
|
if ((wrapper == NULL) || (*wrapper == '\0'))
|
|
|
|
return NULL;
|
2003-01-29 12:53:18 +08:00
|
|
|
|
2003-11-06 22:21:15 +08:00
|
|
|
/* Absolute path? */
|
2003-01-29 12:53:18 +08:00
|
|
|
#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
|
2003-11-06 22:21:15 +08:00
|
|
|
if (isalpha (wrapper[0]) && wrapper[1] == ':')
|
|
|
|
{
|
|
|
|
concat_name = xstrdup (wrapper);
|
|
|
|
if (check_executable(concat_name))
|
|
|
|
return concat_name;
|
|
|
|
XFREE(concat_name);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
#endif
|
|
|
|
if (IS_DIR_SEPARATOR (wrapper[0]))
|
|
|
|
{
|
|
|
|
concat_name = xstrdup (wrapper);
|
|
|
|
if (check_executable(concat_name))
|
2004-08-26 17:02:42 +08:00
|
|
|
return concat_name;
|
2003-11-06 22:21:15 +08:00
|
|
|
XFREE(concat_name);
|
|
|
|
}
|
|
|
|
#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
|
|
|
|
}
|
2003-01-29 12:53:18 +08:00
|
|
|
#endif
|
|
|
|
|
2003-11-06 22:21:15 +08:00
|
|
|
for (p = wrapper; *p; p++)
|
|
|
|
if (*p == '/')
|
|
|
|
{
|
|
|
|
has_slash = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!has_slash)
|
|
|
|
{
|
|
|
|
/* no slashes; search PATH */
|
|
|
|
const char* path = getenv ("PATH");
|
|
|
|
if (path != NULL)
|
|
|
|
{
|
|
|
|
for (p = path; *p; p = p_next)
|
|
|
|
{
|
2004-08-26 17:02:42 +08:00
|
|
|
const char* q;
|
|
|
|
size_t p_len;
|
|
|
|
for (q = p; *q; q++)
|
|
|
|
if (IS_PATH_SEPARATOR(*q))
|
|
|
|
break;
|
|
|
|
p_len = q - p;
|
|
|
|
p_next = (*q == '\0' ? q : q + 1);
|
|
|
|
if (p_len == 0)
|
|
|
|
{
|
|
|
|
/* empty path: current directory */
|
|
|
|
if (getcwd (tmp, LT_PATHMAX) == NULL)
|
|
|
|
lt_fatal ("getcwd failed");
|
|
|
|
tmp_len = strlen(tmp);
|
|
|
|
concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
|
|
|
|
memcpy (concat_name, tmp, tmp_len);
|
|
|
|
concat_name[tmp_len] = '/';
|
|
|
|
strcpy (concat_name + tmp_len + 1, wrapper);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
|
|
|
|
memcpy (concat_name, p, p_len);
|
|
|
|
concat_name[p_len] = '/';
|
|
|
|
strcpy (concat_name + p_len + 1, wrapper);
|
|
|
|
}
|
|
|
|
if (check_executable(concat_name))
|
|
|
|
return concat_name;
|
|
|
|
XFREE(concat_name);
|
2003-11-06 22:21:15 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
/* not found in PATH; assume curdir */
|
|
|
|
}
|
|
|
|
/* Relative path | not found in path: prepend cwd */
|
2003-01-29 12:53:18 +08:00
|
|
|
if (getcwd (tmp, LT_PATHMAX) == NULL)
|
|
|
|
lt_fatal ("getcwd failed");
|
2003-11-06 22:21:15 +08:00
|
|
|
tmp_len = strlen(tmp);
|
|
|
|
concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
|
|
|
|
memcpy (concat_name, tmp, tmp_len);
|
|
|
|
concat_name[tmp_len] = '/';
|
|
|
|
strcpy (concat_name + tmp_len + 1, wrapper);
|
|
|
|
|
|
|
|
if (check_executable(concat_name))
|
|
|
|
return concat_name;
|
|
|
|
XFREE(concat_name);
|
|
|
|
return NULL;
|
2003-01-29 12:53:18 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
2003-09-10 16:40:42 +08:00
|
|
|
strendzap(char *str, const char *pat)
|
2003-01-29 12:53:18 +08:00
|
|
|
{
|
|
|
|
size_t len, patlen;
|
|
|
|
|
|
|
|
assert(str != NULL);
|
|
|
|
assert(pat != NULL);
|
|
|
|
|
|
|
|
len = strlen(str);
|
|
|
|
patlen = strlen(pat);
|
|
|
|
|
|
|
|
if (patlen <= len)
|
|
|
|
{
|
|
|
|
str += len - patlen;
|
|
|
|
if (strcmp(str, pat) == 0)
|
|
|
|
*str = '\0';
|
|
|
|
}
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2003-09-10 16:40:42 +08:00
|
|
|
lt_error_core (int exit_status, const char * mode,
|
2004-08-26 17:02:42 +08:00
|
|
|
const char * message, va_list ap)
|
2003-01-29 12:53:18 +08:00
|
|
|
{
|
|
|
|
fprintf (stderr, "%s: %s: ", program_name, mode);
|
|
|
|
vfprintf (stderr, message, ap);
|
|
|
|
fprintf (stderr, ".\n");
|
|
|
|
|
|
|
|
if (exit_status >= 0)
|
|
|
|
exit (exit_status);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
lt_fatal (const char *message, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
va_start (ap, message);
|
|
|
|
lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
|
|
|
|
va_end (ap);
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
# we should really use a build-platform specific compiler
|
|
|
|
# here, but OTOH, the wrappers (shell script and this C one)
|
|
|
|
# are only useful if you want to execute the "real" binary.
|
|
|
|
# Since the "real" binary is built for $host, then this
|
|
|
|
# wrapper might as well be built for $host, too.
|
|
|
|
$run $LTCC -s -o $cwrapper $cwrappersource
|
|
|
|
;;
|
|
|
|
esac
|
1999-10-30 18:39:28 +08:00
|
|
|
$rm $output
|
2004-02-12 20:27:46 +08:00
|
|
|
trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
$echo > $output "\
|
|
|
|
#! $SHELL
|
|
|
|
|
|
|
|
# $output - temporary wrapper script for $objdir/$outputname
|
2003-11-26 20:34:23 +08:00
|
|
|
# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
|
1999-10-30 18:39:28 +08:00
|
|
|
#
|
|
|
|
# The $output program cannot be directly executed until all the libtool
|
|
|
|
# libraries that it depends on are installed.
|
|
|
|
#
|
|
|
|
# This wrapper script should never be moved out of the build directory.
|
|
|
|
# If it is, it will not operate correctly.
|
|
|
|
|
|
|
|
# Sed substitution that helps us do robust quoting. It backslashifies
|
|
|
|
# metacharacters that are still active within double-quoted strings.
|
2002-01-30 06:58:35 +08:00
|
|
|
Xsed='${SED} -e 1s/^X//'
|
1999-10-30 18:39:28 +08:00
|
|
|
sed_quote_subst='$sed_quote_subst'
|
|
|
|
|
2004-07-30 22:20:26 +08:00
|
|
|
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
|
|
|
# if CDPATH is set.
|
2004-07-30 21:35:30 +08:00
|
|
|
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
relink_command=\"$relink_command\"
|
|
|
|
|
|
|
|
# This environment variable determines our operation mode.
|
|
|
|
if test \"\$libtool_install_magic\" = \"$magic\"; then
|
|
|
|
# install mode needs the following variable:
|
2001-04-25 04:30:21 +08:00
|
|
|
notinst_deplibs='$notinst_deplibs'
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
|
|
|
# When we are sourced in execute mode, \$file and \$echo are already set.
|
|
|
|
if test \"\$libtool_execute_magic\" != \"$magic\"; then
|
|
|
|
echo=\"$qecho\"
|
|
|
|
file=\"\$0\"
|
|
|
|
# Make sure echo works.
|
|
|
|
if test \"X\$1\" = X--no-reexec; then
|
|
|
|
# Discard the --no-reexec flag, and continue.
|
|
|
|
shift
|
|
|
|
elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
|
|
|
|
# Yippee, \$echo works!
|
|
|
|
:
|
|
|
|
else
|
|
|
|
# Restart under the correct shell, and then maybe \$echo will work.
|
|
|
|
exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
|
|
|
|
fi
|
|
|
|
fi\
|
|
|
|
"
|
|
|
|
$echo >> $output "\
|
|
|
|
|
|
|
|
# Find the directory that this script lives in.
|
|
|
|
thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
|
|
|
|
test \"x\$thisdir\" = \"x\$file\" && thisdir=.
|
|
|
|
|
|
|
|
# Follow symbolic links until we get to the real thisdir.
|
2002-01-30 06:58:35 +08:00
|
|
|
file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
|
1999-10-30 18:39:28 +08:00
|
|
|
while test -n \"\$file\"; do
|
|
|
|
destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
|
|
|
|
|
|
|
|
# If there was a directory component, then change thisdir.
|
|
|
|
if test \"x\$destdir\" != \"x\$file\"; then
|
|
|
|
case \"\$destdir\" in
|
2000-03-29 14:48:06 +08:00
|
|
|
[\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
|
1999-10-30 18:39:28 +08:00
|
|
|
*) thisdir=\"\$thisdir/\$destdir\" ;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
|
|
|
file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
|
2002-01-30 06:58:35 +08:00
|
|
|
file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
|
1999-10-30 18:39:28 +08:00
|
|
|
done
|
|
|
|
|
|
|
|
# Try to get the absolute directory name.
|
|
|
|
absdir=\`cd \"\$thisdir\" && pwd\`
|
|
|
|
test -n \"\$absdir\" && thisdir=\"\$absdir\"
|
|
|
|
"
|
|
|
|
|
|
|
|
if test "$fast_install" = yes; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo >> $output "\
|
2001-03-31 08:08:03 +08:00
|
|
|
program=lt-'$outputname'$exeext
|
1999-10-30 18:39:28 +08:00
|
|
|
progdir=\"\$thisdir/$objdir\"
|
2000-01-25 04:34:46 +08:00
|
|
|
|
2004-02-13 07:47:46 +08:00
|
|
|
if test ! -f \"\$progdir/\$program\" ||
|
2002-01-30 06:58:35 +08:00
|
|
|
{ file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
|
1999-10-30 18:39:28 +08:00
|
|
|
test \"X\$file\" != \"X\$progdir/\$program\"; }; then
|
|
|
|
|
|
|
|
file=\"\$\$-\$program\"
|
|
|
|
|
|
|
|
if test ! -d \"\$progdir\"; then
|
|
|
|
$mkdir \"\$progdir\"
|
|
|
|
else
|
|
|
|
$rm \"\$progdir/\$file\"
|
|
|
|
fi"
|
|
|
|
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo >> $output "\
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
# relink executable if necessary
|
|
|
|
if test -n \"\$relink_command\"; then
|
2001-05-28 07:20:45 +08:00
|
|
|
if relink_command_output=\`eval \$relink_command 2>&1\`; then :
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
2001-09-03 06:07:38 +08:00
|
|
|
$echo \"\$relink_command_output\" >&2
|
1999-10-30 18:39:28 +08:00
|
|
|
$rm \"\$progdir/\$file\"
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
$mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
|
|
|
|
{ $rm \"\$progdir/\$program\";
|
|
|
|
$mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
|
|
|
|
$rm \"\$progdir/\$file\"
|
|
|
|
fi"
|
|
|
|
else
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo >> $output "\
|
1999-10-30 18:39:28 +08:00
|
|
|
program='$outputname'
|
|
|
|
progdir=\"\$thisdir/$objdir\"
|
|
|
|
"
|
|
|
|
fi
|
|
|
|
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo >> $output "\
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
if test -f \"\$progdir/\$program\"; then"
|
|
|
|
|
|
|
|
# Export our shlibpath_var if we have one.
|
|
|
|
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
|
|
|
|
$echo >> $output "\
|
|
|
|
# Add our own library path to $shlibpath_var
|
|
|
|
$shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
|
|
|
|
|
|
|
|
# Some systems cannot cope with colon-terminated $shlibpath_var
|
|
|
|
# The second colon is a workaround for a bug in BeOS R4 sed
|
|
|
|
$shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
|
|
|
|
|
|
|
|
export $shlibpath_var
|
|
|
|
"
|
|
|
|
fi
|
|
|
|
|
|
|
|
# fixup the dll searchpath if we need to.
|
|
|
|
if test -n "$dllsearchpath"; then
|
|
|
|
$echo >> $output "\
|
|
|
|
# Add the dll search path components to the executable PATH
|
|
|
|
PATH=$dllsearchpath:\$PATH
|
|
|
|
"
|
|
|
|
fi
|
|
|
|
|
|
|
|
$echo >> $output "\
|
|
|
|
if test \"\$libtool_execute_magic\" != \"$magic\"; then
|
|
|
|
# Run the actual program with our arguments.
|
|
|
|
"
|
|
|
|
case $host in
|
2000-05-17 18:20:26 +08:00
|
|
|
# Backslashes separate directories on plain windows
|
|
|
|
*-*-mingw | *-*-os2*)
|
1999-10-30 18:39:28 +08:00
|
|
|
$echo >> $output "\
|
|
|
|
exec \$progdir\\\\\$program \${1+\"\$@\"}
|
|
|
|
"
|
|
|
|
;;
|
2000-05-17 18:20:26 +08:00
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
*)
|
|
|
|
$echo >> $output "\
|
2002-11-19 00:40:59 +08:00
|
|
|
exec \$progdir/\$program \${1+\"\$@\"}
|
1999-10-30 18:39:28 +08:00
|
|
|
"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
$echo >> $output "\
|
|
|
|
\$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
# The program doesn't exist.
|
|
|
|
\$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
|
|
|
|
\$echo \"This script is just a wrapper for \$program.\" 1>&2
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo \"See the $PACKAGE documentation for more information.\" 1>&2
|
1999-10-30 18:39:28 +08:00
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
fi\
|
|
|
|
"
|
|
|
|
chmod +x $output
|
|
|
|
fi
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_SUCCESS
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
# See if we need to build an old-fashioned archive.
|
|
|
|
for oldlib in $oldlibs; do
|
|
|
|
|
|
|
|
if test "$build_libtool_libs" = convenience; then
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
oldobjs="$libobjs_save $symfileobj"
|
1999-10-30 18:39:28 +08:00
|
|
|
addlibs="$convenience"
|
|
|
|
build_libtool_libs=no
|
|
|
|
else
|
|
|
|
if test "$build_libtool_libs" = module; then
|
|
|
|
oldobjs="$libobjs_save"
|
|
|
|
build_libtool_libs=no
|
|
|
|
else
|
2002-09-10 02:26:34 +08:00
|
|
|
oldobjs="$old_deplibs $non_pic_objects"
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
if test "$preload" = yes && test -f "$dlsymsobj"; then
|
|
|
|
oldobjs="$oldobjs $symfileobj"
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
addlibs="$old_convenience"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$addlibs"; then
|
|
|
|
gentop="$output_objdir/${outputname}x"
|
|
|
|
generated="$generated $gentop"
|
2000-01-25 04:34:46 +08:00
|
|
|
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
func_extract_archives $gentop $addlibs
|
|
|
|
oldobjs="$oldobjs $func_extract_archives_result"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Do each command in the archive commands.
|
|
|
|
if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
|
2004-08-26 17:02:42 +08:00
|
|
|
cmds=$old_archive_from_new_cmds
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
|
2004-08-26 17:02:42 +08:00
|
|
|
# Add any objects from preloaded convenience libraries
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
if test -n "$dlprefiles"; then
|
|
|
|
gentop="$output_objdir/${outputname}x"
|
|
|
|
generated="$generated $gentop"
|
|
|
|
|
|
|
|
func_extract_archives $gentop $dlprefiles
|
|
|
|
oldobjs="$oldobjs $func_extract_archives_result"
|
|
|
|
fi
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
eval cmds=\"$old_archive_cmds\"
|
2001-05-28 07:20:45 +08:00
|
|
|
|
2001-09-03 06:07:38 +08:00
|
|
|
if len=`expr "X$cmds" : ".*"` &&
|
|
|
|
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
|
2003-11-22 22:03:35 +08:00
|
|
|
cmds=$old_archive_cmds
|
2001-09-03 06:07:38 +08:00
|
|
|
else
|
|
|
|
# the command line is too long to link in one step, link in parts
|
|
|
|
$echo "using piecewise archive linking..."
|
2001-05-28 07:20:45 +08:00
|
|
|
save_RANLIB=$RANLIB
|
|
|
|
RANLIB=:
|
2001-09-03 06:07:38 +08:00
|
|
|
objlist=
|
|
|
|
concat_cmds=
|
|
|
|
save_oldobjs=$oldobjs
|
2002-05-06 21:38:11 +08:00
|
|
|
# GNU ar 2.10+ was changed to match POSIX; thus no paths are
|
|
|
|
# encoded into archives. This makes 'ar r' malfunction in
|
|
|
|
# this piecewise linking case whenever conflicting object
|
|
|
|
# names appear in distinct ar calls; check, warn and compensate.
|
|
|
|
if (for obj in $save_oldobjs
|
|
|
|
do
|
|
|
|
$echo "X$obj" | $Xsed -e 's%^.*/%%'
|
|
|
|
done | sort | sort -uc >/dev/null 2>&1); then
|
|
|
|
:
|
|
|
|
else
|
|
|
|
$echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
|
|
|
|
$echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
|
|
|
|
AR_FLAGS=cq
|
|
|
|
fi
|
2003-02-24 07:49:34 +08:00
|
|
|
# Is there a better way of finding the last object in the list?
|
|
|
|
for obj in $save_oldobjs
|
|
|
|
do
|
|
|
|
last_oldobj=$obj
|
2003-09-10 16:40:42 +08:00
|
|
|
done
|
2001-09-03 06:07:38 +08:00
|
|
|
for obj in $save_oldobjs
|
|
|
|
do
|
|
|
|
oldobjs="$objlist $obj"
|
|
|
|
objlist="$objlist $obj"
|
|
|
|
eval test_cmds=\"$old_archive_cmds\"
|
|
|
|
if len=`expr "X$test_cmds" : ".*"` &&
|
|
|
|
test "$len" -le "$max_cmd_len"; then
|
|
|
|
:
|
|
|
|
else
|
|
|
|
# the above command should be used before it gets too long
|
|
|
|
oldobjs=$objlist
|
2003-02-24 07:49:34 +08:00
|
|
|
if test "$obj" = "$last_oldobj" ; then
|
2004-08-26 17:02:42 +08:00
|
|
|
RANLIB=$save_RANLIB
|
2003-09-10 16:40:42 +08:00
|
|
|
fi
|
2001-05-28 07:20:45 +08:00
|
|
|
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
|
2001-09-03 06:07:38 +08:00
|
|
|
eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
|
|
|
|
objlist=
|
|
|
|
fi
|
|
|
|
done
|
2001-05-28 07:20:45 +08:00
|
|
|
RANLIB=$save_RANLIB
|
2001-09-03 06:07:38 +08:00
|
|
|
oldobjs=$objlist
|
2003-01-29 06:34:27 +08:00
|
|
|
if test "X$oldobjs" = "X" ; then
|
|
|
|
eval cmds=\"\$concat_cmds\"
|
|
|
|
else
|
2003-11-22 22:03:35 +08:00
|
|
|
eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
|
2003-01-29 06:34:27 +08:00
|
|
|
fi
|
2001-09-03 06:07:38 +08:00
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
2001-09-11 07:33:26 +08:00
|
|
|
save_ifs="$IFS"; IFS='~'
|
1999-10-30 18:39:28 +08:00
|
|
|
for cmd in $cmds; do
|
2004-08-26 17:02:42 +08:00
|
|
|
eval cmd=\"$cmd\"
|
1999-10-30 18:39:28 +08:00
|
|
|
IFS="$save_ifs"
|
|
|
|
$show "$cmd"
|
|
|
|
$run eval "$cmd" || exit $?
|
|
|
|
done
|
|
|
|
IFS="$save_ifs"
|
|
|
|
done
|
|
|
|
|
|
|
|
if test -n "$generated"; then
|
|
|
|
$show "${rm}r$generated"
|
|
|
|
$run ${rm}r$generated
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Now create the libtool archive.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $output in
|
1999-10-30 18:39:28 +08:00
|
|
|
*.la)
|
|
|
|
old_library=
|
|
|
|
test "$build_old_libs" = yes && old_library="$libname.$libext"
|
|
|
|
$show "creating $output"
|
|
|
|
|
2000-03-21 20:39:33 +08:00
|
|
|
# Preserve any variables that may affect compiler behavior
|
|
|
|
for var in $variables_saved_for_relink; do
|
2000-09-03 11:13:56 +08:00
|
|
|
if eval test -z \"\${$var+set}\"; then
|
|
|
|
relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
|
|
|
|
elif eval var_value=\$$var; test -z "$var_value"; then
|
|
|
|
relink_command="$var=; export $var; $relink_command"
|
|
|
|
else
|
|
|
|
var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
|
|
|
|
relink_command="$var=\"$var_value\"; export $var; $relink_command"
|
|
|
|
fi
|
2000-03-21 20:39:33 +08:00
|
|
|
done
|
1999-10-30 18:39:28 +08:00
|
|
|
# Quote the link command for shipping.
|
2004-02-12 20:27:46 +08:00
|
|
|
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
|
1999-10-30 18:39:28 +08:00
|
|
|
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
2003-04-10 01:54:06 +08:00
|
|
|
if test "$hardcode_automatic" = yes ; then
|
2004-02-13 07:47:46 +08:00
|
|
|
relink_command=
|
2003-09-10 16:40:42 +08:00
|
|
|
fi
|
2004-02-13 07:47:46 +08:00
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# Only create the output if not a dry run.
|
|
|
|
if test -z "$run"; then
|
|
|
|
for installed in no yes; do
|
|
|
|
if test "$installed" = yes; then
|
|
|
|
if test -z "$install_libdir"; then
|
|
|
|
break
|
|
|
|
fi
|
|
|
|
output="$output_objdir/$outputname"i
|
|
|
|
# Replace all uninstalled libtool libraries with the installed ones
|
|
|
|
newdependency_libs=
|
|
|
|
for deplib in $dependency_libs; do
|
2001-03-06 04:08:09 +08:00
|
|
|
case $deplib in
|
2000-01-25 04:34:46 +08:00
|
|
|
*.la)
|
1999-10-30 18:39:28 +08:00
|
|
|
name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
|
2002-01-30 06:58:35 +08:00
|
|
|
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
1999-10-30 18:39:28 +08:00
|
|
|
if test -z "$libdir"; then
|
|
|
|
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
newdependency_libs="$newdependency_libs $libdir/$name"
|
|
|
|
;;
|
|
|
|
*) newdependency_libs="$newdependency_libs $deplib" ;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
dependency_libs="$newdependency_libs"
|
2000-02-02 00:43:34 +08:00
|
|
|
newdlfiles=
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
|
2000-02-02 00:43:34 +08:00
|
|
|
for lib in $dlfiles; do
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
case $lib in
|
|
|
|
*.la)
|
|
|
|
name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
|
2004-08-26 17:02:42 +08:00
|
|
|
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
|
|
|
|
if test -z "$libdir"; then
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
|
|
|
|
exit $EXIT_FAILURE
|
2004-08-26 17:02:42 +08:00
|
|
|
fi
|
|
|
|
newdlfiles="$newdlfiles $libdir/$name"
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
;;
|
|
|
|
*) newdlfiles="$newdlfiles $lib" ;;
|
|
|
|
esac
|
2000-02-02 00:43:34 +08:00
|
|
|
done
|
|
|
|
dlfiles="$newdlfiles"
|
|
|
|
newdlprefiles=
|
|
|
|
for lib in $dlprefiles; do
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
case $lib in
|
|
|
|
*.la)
|
2004-08-26 17:02:42 +08:00
|
|
|
# Only pass preopened files to the pseudo-archive (for
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
# eventual linking with the app. that links it) if we
|
|
|
|
# didn't already link the preopened objects directly into
|
|
|
|
# the library:
|
2004-08-26 17:02:42 +08:00
|
|
|
name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
|
|
|
|
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
|
|
|
|
if test -z "$libdir"; then
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
|
|
|
|
exit $EXIT_FAILURE
|
2004-08-26 17:02:42 +08:00
|
|
|
fi
|
|
|
|
newdlprefiles="$newdlprefiles $libdir/$name"
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
;;
|
|
|
|
esac
|
2000-02-02 00:43:34 +08:00
|
|
|
done
|
|
|
|
dlprefiles="$newdlprefiles"
|
* ltmain.in: Provide absolute paths for dlopen and dlpreopen
files in generating uninstalled libtool libraries.
* mdemo2/main.c, mdemo2/Makefile.am, mdemo2/README,
mdemo2/configure.ac, mdemo2/.cvsignore, mdemo/mlib.c,
tests/mdemo2-conf.test, tests/mdemo2-exec.test,
tests/mdemo2-make.test: New files for testing above feature.
* configure.ac, bootstrap, tests/Makefile.am: Accomodate new
test directory.
* mdemo/Makefile.am: Build libmlib.la for mdemo2 tests.
2003-08-01 04:41:35 +08:00
|
|
|
else
|
|
|
|
newdlfiles=
|
|
|
|
for lib in $dlfiles; do
|
2003-09-10 16:40:42 +08:00
|
|
|
case $lib in
|
* ltmain.in: Provide absolute paths for dlopen and dlpreopen
files in generating uninstalled libtool libraries.
* mdemo2/main.c, mdemo2/Makefile.am, mdemo2/README,
mdemo2/configure.ac, mdemo2/.cvsignore, mdemo/mlib.c,
tests/mdemo2-conf.test, tests/mdemo2-exec.test,
tests/mdemo2-make.test: New files for testing above feature.
* configure.ac, bootstrap, tests/Makefile.am: Accomodate new
test directory.
* mdemo/Makefile.am: Build libmlib.la for mdemo2 tests.
2003-08-01 04:41:35 +08:00
|
|
|
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
|
|
|
|
*) abs=`pwd`"/$lib" ;;
|
|
|
|
esac
|
|
|
|
newdlfiles="$newdlfiles $abs"
|
|
|
|
done
|
|
|
|
dlfiles="$newdlfiles"
|
|
|
|
newdlprefiles=
|
|
|
|
for lib in $dlprefiles; do
|
2003-09-10 16:40:42 +08:00
|
|
|
case $lib in
|
* ltmain.in: Provide absolute paths for dlopen and dlpreopen
files in generating uninstalled libtool libraries.
* mdemo2/main.c, mdemo2/Makefile.am, mdemo2/README,
mdemo2/configure.ac, mdemo2/.cvsignore, mdemo/mlib.c,
tests/mdemo2-conf.test, tests/mdemo2-exec.test,
tests/mdemo2-make.test: New files for testing above feature.
* configure.ac, bootstrap, tests/Makefile.am: Accomodate new
test directory.
* mdemo/Makefile.am: Build libmlib.la for mdemo2 tests.
2003-08-01 04:41:35 +08:00
|
|
|
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
|
|
|
|
*) abs=`pwd`"/$lib" ;;
|
|
|
|
esac
|
|
|
|
newdlprefiles="$newdlprefiles $abs"
|
|
|
|
done
|
|
|
|
dlprefiles="$newdlprefiles"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
$rm $output
|
2001-03-31 08:08:03 +08:00
|
|
|
# place dlname in correct position for cygwin
|
|
|
|
tdlname=$dlname
|
|
|
|
case $host,$output,$installed,$module,$dlname in
|
2002-10-16 06:50:58 +08:00
|
|
|
*cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
|
2001-03-31 08:08:03 +08:00
|
|
|
esac
|
1999-10-30 18:39:28 +08:00
|
|
|
$echo > $output "\
|
|
|
|
# $outputname - a libtool library file
|
2003-11-26 20:34:23 +08:00
|
|
|
# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
|
1999-10-30 18:39:28 +08:00
|
|
|
#
|
|
|
|
# Please DO NOT delete this file!
|
|
|
|
# It is necessary for linking the library.
|
|
|
|
|
|
|
|
# The name that we can dlopen(3).
|
2001-03-31 08:08:03 +08:00
|
|
|
dlname='$tdlname'
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
# Names of this library.
|
|
|
|
library_names='$library_names'
|
|
|
|
|
|
|
|
# The name of the static archive.
|
|
|
|
old_library='$old_library'
|
|
|
|
|
2004-06-21 22:52:57 +08:00
|
|
|
# Linker flags that can not go in dependency_libs.
|
|
|
|
inherited_linker_flags='$inherited_linker_flags'
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# Libraries that this one depends upon.
|
|
|
|
dependency_libs='$dependency_libs'
|
|
|
|
|
|
|
|
# Version information for $libname.
|
|
|
|
current=$current
|
|
|
|
age=$age
|
|
|
|
revision=$revision
|
|
|
|
|
|
|
|
# Is this an already installed library?
|
|
|
|
installed=$installed
|
|
|
|
|
2003-03-21 04:24:21 +08:00
|
|
|
# Should we warn about portability when linking against -modules?
|
|
|
|
shouldnotlink=$module
|
|
|
|
|
2000-02-02 00:43:34 +08:00
|
|
|
# Files to dlopen/dlpreopen
|
|
|
|
dlopen='$dlfiles'
|
|
|
|
dlpreopen='$dlprefiles'
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# Directory that this library needs to be installed in:
|
|
|
|
libdir='$install_libdir'"
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$installed" = no && test "$need_relink" = yes; then
|
1999-10-30 18:39:28 +08:00
|
|
|
$echo >> $output "\
|
|
|
|
relink_command=\"$relink_command\""
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Do a symbolic link so that the libtool archive can be found in
|
|
|
|
# LD_LIBRARY_PATH before the program is installed.
|
|
|
|
$show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
|
|
|
|
$run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
|
|
|
|
;;
|
|
|
|
esac
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_SUCCESS
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
|
|
|
# libtool install mode
|
|
|
|
install)
|
|
|
|
modename="$modename: install"
|
|
|
|
|
|
|
|
# There may be an optional sh(1) argument at the beginning of
|
|
|
|
# install_prog (especially on Windows NT).
|
2000-07-24 13:42:55 +08:00
|
|
|
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
|
|
|
|
# Allow the use of GNU shtool's install command.
|
2004-01-22 23:27:25 +08:00
|
|
|
$echo "X$nonopt" | $Xsed | $GREP shtool > /dev/null; then
|
1999-10-30 18:39:28 +08:00
|
|
|
# Aesthetically quote it.
|
|
|
|
arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
|
2001-03-06 04:08:09 +08:00
|
|
|
case $arg in
|
1999-10-30 18:39:28 +08:00
|
|
|
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
|
|
|
|
arg="\"$arg\""
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
install_prog="$arg "
|
|
|
|
arg="$1"
|
|
|
|
shift
|
|
|
|
else
|
|
|
|
install_prog=
|
|
|
|
arg="$nonopt"
|
|
|
|
fi
|
|
|
|
|
|
|
|
# The real first argument should be the name of the installation program.
|
|
|
|
# Aesthetically quote it.
|
|
|
|
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
|
2001-03-06 04:08:09 +08:00
|
|
|
case $arg in
|
1999-10-30 18:39:28 +08:00
|
|
|
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
|
|
|
|
arg="\"$arg\""
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
install_prog="$install_prog$arg"
|
|
|
|
|
|
|
|
# We need to accept at least all the BSD install flags.
|
|
|
|
dest=
|
|
|
|
files=
|
|
|
|
opts=
|
|
|
|
prev=
|
|
|
|
install_type=
|
|
|
|
isdir=no
|
|
|
|
stripme=
|
|
|
|
for arg
|
|
|
|
do
|
|
|
|
if test -n "$dest"; then
|
|
|
|
files="$files $dest"
|
|
|
|
dest="$arg"
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
|
2001-03-06 04:08:09 +08:00
|
|
|
case $arg in
|
1999-10-30 18:39:28 +08:00
|
|
|
-d) isdir=yes ;;
|
|
|
|
-f) prev="-f" ;;
|
|
|
|
-g) prev="-g" ;;
|
|
|
|
-m) prev="-m" ;;
|
|
|
|
-o) prev="-o" ;;
|
|
|
|
-s)
|
|
|
|
stripme=" -s"
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
-*) ;;
|
|
|
|
|
|
|
|
*)
|
|
|
|
# If the previous option needed an argument, then skip it.
|
|
|
|
if test -n "$prev"; then
|
|
|
|
prev=
|
|
|
|
else
|
|
|
|
dest="$arg"
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
# Aesthetically quote the argument.
|
|
|
|
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
|
2001-03-06 04:08:09 +08:00
|
|
|
case $arg in
|
1999-10-30 18:39:28 +08:00
|
|
|
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
|
|
|
|
arg="\"$arg\""
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
install_prog="$install_prog $arg"
|
|
|
|
done
|
|
|
|
|
|
|
|
if test -z "$install_prog"; then
|
|
|
|
$echo "$modename: you must specify an install program" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$prev"; then
|
|
|
|
$echo "$modename: the \`$prev' option requires an argument" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test -z "$files"; then
|
|
|
|
if test -z "$dest"; then
|
|
|
|
$echo "$modename: no file or destination specified" 1>&2
|
|
|
|
else
|
|
|
|
$echo "$modename: you must specify a destination" 1>&2
|
|
|
|
fi
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Strip any trailing slash from the destination.
|
|
|
|
dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
|
|
|
|
|
|
|
|
# Check to see that the destination is a directory.
|
|
|
|
test -d "$dest" && isdir=yes
|
|
|
|
if test "$isdir" = yes; then
|
|
|
|
destdir="$dest"
|
|
|
|
destname=
|
|
|
|
else
|
|
|
|
destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
|
|
|
|
test "X$destdir" = "X$dest" && destdir=.
|
|
|
|
destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
|
|
|
|
|
|
|
|
# Not a directory, so check to see that there is only one file specified.
|
|
|
|
set dummy $files
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$#" -gt 2; then
|
1999-10-30 18:39:28 +08:00
|
|
|
$echo "$modename: \`$dest' is not a directory" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
fi
|
2001-03-06 04:08:09 +08:00
|
|
|
case $destdir in
|
1999-10-30 18:39:28 +08:00
|
|
|
[\\/]* | [A-Za-z]:[\\/]*) ;;
|
|
|
|
*)
|
|
|
|
for file in $files; do
|
2001-03-06 04:08:09 +08:00
|
|
|
case $file in
|
1999-10-30 18:39:28 +08:00
|
|
|
*.lo) ;;
|
|
|
|
*)
|
|
|
|
$echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
# This variable tells wrapper scripts just to set variables rather
|
|
|
|
# than running their programs.
|
|
|
|
libtool_install_magic="$magic"
|
|
|
|
|
|
|
|
staticlibs=
|
|
|
|
future_libdirs=
|
|
|
|
current_libdirs=
|
|
|
|
for file in $files; do
|
|
|
|
|
|
|
|
# Do each installation.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $file in
|
2000-02-02 00:43:34 +08:00
|
|
|
*.$libext)
|
1999-10-30 18:39:28 +08:00
|
|
|
# Do the static libraries later.
|
|
|
|
staticlibs="$staticlibs $file"
|
|
|
|
;;
|
|
|
|
|
|
|
|
*.la)
|
|
|
|
# Check to see that this really is a libtool archive.
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
if (${SED} -e '2q' $file | $GREP "^# Generated by ltmain.sh ") >/dev/null 2>&1; then :
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
|
|
|
$echo "$modename: \`$file' is not a valid libtool archive" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
library_names=
|
|
|
|
old_library=
|
|
|
|
relink_command=
|
|
|
|
# If there is no directory component, then add one.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $file in
|
1999-10-30 18:39:28 +08:00
|
|
|
*/* | *\\*) . $file ;;
|
|
|
|
*) . ./$file ;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
# Add the libdir to current_libdirs if it is the destination.
|
|
|
|
if test "X$destdir" = "X$libdir"; then
|
|
|
|
case "$current_libdirs " in
|
|
|
|
*" $libdir "*) ;;
|
|
|
|
*) current_libdirs="$current_libdirs $libdir" ;;
|
|
|
|
esac
|
|
|
|
else
|
|
|
|
# Note the libdir as a future libdir.
|
|
|
|
case "$future_libdirs " in
|
|
|
|
*" $libdir "*) ;;
|
|
|
|
*) future_libdirs="$future_libdirs $libdir" ;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
1999-11-05 00:15:50 +08:00
|
|
|
dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
|
1999-10-30 18:39:28 +08:00
|
|
|
test "X$dir" = "X$file/" && dir=
|
|
|
|
dir="$dir$objdir"
|
|
|
|
|
2000-09-05 19:03:06 +08:00
|
|
|
if test -n "$relink_command"; then
|
2002-11-04 01:35:37 +08:00
|
|
|
# Determine the prefix the user has applied to our future dir.
|
2002-12-20 12:56:26 +08:00
|
|
|
inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
|
2002-11-04 01:35:37 +08:00
|
|
|
|
|
|
|
# Don't allow the user to place us outside of our expected
|
|
|
|
# location b/c this prevents finding dependent libraries that
|
|
|
|
# are installed to the same prefix.
|
|
|
|
# At present, this check doesn't affect windows .dll's that
|
|
|
|
# are installed into $libdir/../bin (currently, that works fine)
|
|
|
|
# but it's something to keep an eye on.
|
|
|
|
if test "$inst_prefix_dir" = "$destdir"; then
|
|
|
|
$echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2002-11-04 01:35:37 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$inst_prefix_dir"; then
|
|
|
|
# Stick the inst_prefix_dir data into the link command.
|
2002-12-20 12:56:26 +08:00
|
|
|
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
|
2002-11-04 01:35:37 +08:00
|
|
|
else
|
2002-12-20 12:56:26 +08:00
|
|
|
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
|
2002-11-04 01:35:37 +08:00
|
|
|
fi
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
$echo "$modename: warning: relinking \`$file'" 1>&2
|
|
|
|
$show "$relink_command"
|
|
|
|
if $run eval "$relink_command"; then :
|
|
|
|
else
|
|
|
|
$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
fi
|
2000-01-25 04:34:46 +08:00
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# See the names of the shared library.
|
|
|
|
set dummy $library_names
|
|
|
|
if test -n "$2"; then
|
|
|
|
realname="$2"
|
|
|
|
shift
|
|
|
|
shift
|
|
|
|
|
|
|
|
srcname="$realname"
|
2000-09-04 12:00:48 +08:00
|
|
|
test -n "$relink_command" && srcname="$realname"T
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
# Install the shared library and build the symlinks.
|
|
|
|
$show "$install_prog $dir/$srcname $destdir/$realname"
|
|
|
|
$run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
|
|
|
|
if test -n "$stripme" && test -n "$striplib"; then
|
|
|
|
$show "$striplib $destdir/$realname"
|
|
|
|
$run eval "$striplib $destdir/$realname" || exit $?
|
|
|
|
fi
|
|
|
|
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$#" -gt 0; then
|
1999-10-30 18:39:28 +08:00
|
|
|
# Delete the old symlinks, and create new ones.
|
|
|
|
for linkname
|
|
|
|
do
|
|
|
|
if test "$linkname" != "$realname"; then
|
|
|
|
$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
|
|
|
|
$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Do each command in the postinstall commands.
|
|
|
|
lib="$destdir/$realname"
|
2003-11-22 22:03:35 +08:00
|
|
|
cmds=$postinstall_cmds
|
2001-09-11 07:33:26 +08:00
|
|
|
save_ifs="$IFS"; IFS='~'
|
1999-10-30 18:39:28 +08:00
|
|
|
for cmd in $cmds; do
|
|
|
|
IFS="$save_ifs"
|
2003-11-22 22:03:35 +08:00
|
|
|
eval cmd=\"$cmd\"
|
1999-10-30 18:39:28 +08:00
|
|
|
$show "$cmd"
|
|
|
|
$run eval "$cmd" || exit $?
|
|
|
|
done
|
|
|
|
IFS="$save_ifs"
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Install the pseudo-library for information purposes.
|
|
|
|
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
|
|
|
|
instname="$dir/$name"i
|
|
|
|
$show "$install_prog $instname $destdir/$name"
|
|
|
|
$run eval "$install_prog $instname $destdir/$name" || exit $?
|
|
|
|
|
|
|
|
# Maybe install the static library, too.
|
|
|
|
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
|
|
|
|
;;
|
|
|
|
|
|
|
|
*.lo)
|
|
|
|
# Install (i.e. copy) a libtool object.
|
|
|
|
|
|
|
|
# Figure out destination file name, if it wasn't already specified.
|
|
|
|
if test -n "$destname"; then
|
|
|
|
destfile="$destdir/$destname"
|
|
|
|
else
|
|
|
|
destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
|
|
|
|
destfile="$destdir/$destfile"
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Deduce the name of the destination old-style object file.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $destfile in
|
1999-10-30 18:39:28 +08:00
|
|
|
*.lo)
|
|
|
|
staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
|
|
|
|
;;
|
2000-02-02 00:43:34 +08:00
|
|
|
*.$objext)
|
1999-10-30 18:39:28 +08:00
|
|
|
staticdest="$destfile"
|
|
|
|
destfile=
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
$echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
# Install the libtool object if requested.
|
|
|
|
if test -n "$destfile"; then
|
|
|
|
$show "$install_prog $file $destfile"
|
|
|
|
$run eval "$install_prog $file $destfile" || exit $?
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Install the old object if enabled.
|
|
|
|
if test "$build_old_libs" = yes; then
|
|
|
|
# Deduce the name of the old-style object file.
|
|
|
|
staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
|
|
|
|
|
|
|
|
$show "$install_prog $staticobj $staticdest"
|
|
|
|
$run eval "$install_prog \$staticobj \$staticdest" || exit $?
|
|
|
|
fi
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_SUCCESS
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
|
|
|
*)
|
|
|
|
# Figure out destination file name, if it wasn't already specified.
|
|
|
|
if test -n "$destname"; then
|
|
|
|
destfile="$destdir/$destname"
|
|
|
|
else
|
|
|
|
destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
|
|
|
|
destfile="$destdir/$destfile"
|
|
|
|
fi
|
|
|
|
|
2002-03-03 11:19:55 +08:00
|
|
|
# If the file is missing, and there is a .exe on the end, strip it
|
|
|
|
# because it is most likely a libtool script we actually want to
|
|
|
|
# install
|
|
|
|
stripped_ext=""
|
|
|
|
case $file in
|
|
|
|
*.exe)
|
|
|
|
if test ! -f "$file"; then
|
2003-03-21 04:24:21 +08:00
|
|
|
file=`$echo $file|${SED} 's,.exe$,,'`
|
2002-03-03 11:19:55 +08:00
|
|
|
stripped_ext=".exe"
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# Do a test to see if this is really a libtool program.
|
2001-09-22 03:49:29 +08:00
|
|
|
case $host in
|
|
|
|
*cygwin*|*mingw*)
|
2003-03-21 04:24:21 +08:00
|
|
|
wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
|
2001-09-22 03:49:29 +08:00
|
|
|
;;
|
|
|
|
*)
|
|
|
|
wrapper=$file
|
|
|
|
;;
|
|
|
|
esac
|
2004-01-22 23:27:25 +08:00
|
|
|
if (${SED} -e '4q' $wrapper | $GREP "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
|
2001-04-25 04:30:21 +08:00
|
|
|
notinst_deplibs=
|
1999-10-30 18:39:28 +08:00
|
|
|
relink_command=
|
|
|
|
|
2003-01-29 12:53:18 +08:00
|
|
|
# To insure that "foo" is sourced, and not "foo.exe",
|
|
|
|
# finese the cygwin/MSYS system by explicitly sourcing "foo."
|
|
|
|
# which disallows the automatic-append-.exe behavior.
|
2003-02-28 23:27:35 +08:00
|
|
|
case $build in
|
2003-01-29 12:53:18 +08:00
|
|
|
*cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
|
|
|
|
*) wrapperdot=${wrapper} ;;
|
|
|
|
esac
|
1999-10-30 18:39:28 +08:00
|
|
|
# If there is no directory component, then add one.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $file in
|
2003-01-29 12:53:18 +08:00
|
|
|
*/* | *\\*) . ${wrapperdot} ;;
|
|
|
|
*) . ./${wrapperdot} ;;
|
1999-10-30 18:39:28 +08:00
|
|
|
esac
|
|
|
|
|
|
|
|
# Check the variables that should have been set.
|
2001-04-25 04:30:21 +08:00
|
|
|
if test -z "$notinst_deplibs"; then
|
2001-09-22 03:49:29 +08:00
|
|
|
$echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
finalize=yes
|
2001-04-25 04:30:21 +08:00
|
|
|
for lib in $notinst_deplibs; do
|
1999-10-30 18:39:28 +08:00
|
|
|
# Check to see that each library is installed.
|
|
|
|
libdir=
|
|
|
|
if test -f "$lib"; then
|
|
|
|
# If there is no directory component, then add one.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $lib in
|
1999-10-30 18:39:28 +08:00
|
|
|
*/* | *\\*) . $lib ;;
|
|
|
|
*) . ./$lib ;;
|
|
|
|
esac
|
|
|
|
fi
|
1999-11-05 00:15:50 +08:00
|
|
|
libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
|
1999-10-30 18:39:28 +08:00
|
|
|
if test -n "$libdir" && test ! -f "$libfile"; then
|
|
|
|
$echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
|
|
|
|
finalize=no
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
|
|
|
relink_command=
|
2003-01-29 12:53:18 +08:00
|
|
|
# To insure that "foo" is sourced, and not "foo.exe",
|
|
|
|
# finese the cygwin/MSYS system by explicitly sourcing "foo."
|
|
|
|
# which disallows the automatic-append-.exe behavior.
|
2003-02-28 23:27:35 +08:00
|
|
|
case $build in
|
2003-01-29 12:53:18 +08:00
|
|
|
*cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
|
|
|
|
*) wrapperdot=${wrapper} ;;
|
|
|
|
esac
|
1999-10-30 18:39:28 +08:00
|
|
|
# If there is no directory component, then add one.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $file in
|
2003-01-29 12:53:18 +08:00
|
|
|
*/* | *\\*) . ${wrapperdot} ;;
|
|
|
|
*) . ./${wrapperdot} ;;
|
1999-10-30 18:39:28 +08:00
|
|
|
esac
|
|
|
|
|
|
|
|
outputname=
|
|
|
|
if test "$fast_install" = no && test -n "$relink_command"; then
|
|
|
|
if test "$finalize" = yes && test -z "$run"; then
|
|
|
|
tmpdir="/tmp"
|
|
|
|
test -n "$TMPDIR" && tmpdir="$TMPDIR"
|
|
|
|
tmpdir="$tmpdir/libtool-$$"
|
2004-02-04 06:02:51 +08:00
|
|
|
save_umask=`umask`
|
|
|
|
umask 0077
|
|
|
|
if $mkdir "$tmpdir"; then
|
|
|
|
umask $save_umask
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
2004-02-04 06:02:51 +08:00
|
|
|
umask $save_umask
|
1999-10-30 18:39:28 +08:00
|
|
|
$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
|
|
|
|
continue
|
|
|
|
fi
|
2002-03-03 11:19:55 +08:00
|
|
|
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
|
1999-10-30 18:39:28 +08:00
|
|
|
outputname="$tmpdir/$file"
|
|
|
|
# Replace the output file specification.
|
|
|
|
relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
|
|
|
|
|
|
|
|
$show "$relink_command"
|
|
|
|
if $run eval "$relink_command"; then :
|
|
|
|
else
|
|
|
|
$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
|
|
|
|
${rm}r "$tmpdir"
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
file="$outputname"
|
|
|
|
else
|
|
|
|
$echo "$modename: warning: cannot relink \`$file'" 1>&2
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
# Install the binary that we compiled earlier.
|
2002-03-03 11:19:55 +08:00
|
|
|
file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2001-03-31 08:08:03 +08:00
|
|
|
# remove .exe since cygwin /usr/bin/install will append another
|
|
|
|
# one anyways
|
|
|
|
case $install_prog,$host in
|
2001-05-28 07:20:45 +08:00
|
|
|
*/usr/bin/install*,*cygwin*)
|
2001-03-31 08:08:03 +08:00
|
|
|
case $file:$destfile in
|
|
|
|
*.exe:*.exe)
|
|
|
|
# this is ok
|
|
|
|
;;
|
|
|
|
*.exe:*)
|
|
|
|
destfile=$destfile.exe
|
|
|
|
;;
|
|
|
|
*:*.exe)
|
2003-03-21 04:24:21 +08:00
|
|
|
destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
|
2001-03-31 08:08:03 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
esac
|
1999-10-30 18:39:28 +08:00
|
|
|
$show "$install_prog$stripme $file $destfile"
|
|
|
|
$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
|
|
|
|
test -n "$outputname" && ${rm}r "$tmpdir"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
|
|
|
for file in $staticlibs; do
|
|
|
|
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
|
|
|
|
|
|
|
|
# Set up the ranlib parameters.
|
|
|
|
oldlib="$destdir/$name"
|
|
|
|
|
|
|
|
$show "$install_prog $file $oldlib"
|
|
|
|
$run eval "$install_prog \$file \$oldlib" || exit $?
|
|
|
|
|
2003-11-22 22:12:57 +08:00
|
|
|
if test -n "$stripme" && test -n "$old_striplib"; then
|
1999-10-30 18:39:28 +08:00
|
|
|
$show "$old_striplib $oldlib"
|
|
|
|
$run eval "$old_striplib $oldlib" || exit $?
|
|
|
|
fi
|
2000-01-25 04:34:46 +08:00
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# Do each command in the postinstall commands.
|
2003-11-22 22:03:35 +08:00
|
|
|
cmds=$old_postinstall_cmds
|
2001-09-11 07:33:26 +08:00
|
|
|
save_ifs="$IFS"; IFS='~'
|
1999-10-30 18:39:28 +08:00
|
|
|
for cmd in $cmds; do
|
|
|
|
IFS="$save_ifs"
|
2003-11-22 22:03:35 +08:00
|
|
|
eval cmd=\"$cmd\"
|
1999-10-30 18:39:28 +08:00
|
|
|
$show "$cmd"
|
|
|
|
$run eval "$cmd" || exit $?
|
|
|
|
done
|
|
|
|
IFS="$save_ifs"
|
|
|
|
done
|
|
|
|
|
|
|
|
if test -n "$future_libdirs"; then
|
|
|
|
$echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$current_libdirs"; then
|
|
|
|
# Maybe just do a dry run.
|
|
|
|
test -n "$run" && current_libdirs=" -n$current_libdirs"
|
2004-02-12 20:27:46 +08:00
|
|
|
exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
|
2001-06-26 04:42:45 +08:00
|
|
|
else
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_SUCCESS
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
;;
|
|
|
|
|
|
|
|
# libtool finish mode
|
|
|
|
finish)
|
|
|
|
modename="$modename: finish"
|
|
|
|
libdirs="$nonopt"
|
|
|
|
admincmds=
|
|
|
|
|
|
|
|
if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
|
|
|
|
for dir
|
|
|
|
do
|
|
|
|
libdirs="$libdirs $dir"
|
|
|
|
done
|
|
|
|
|
|
|
|
for libdir in $libdirs; do
|
|
|
|
if test -n "$finish_cmds"; then
|
|
|
|
# Do each command in the finish commands.
|
2003-11-22 22:03:35 +08:00
|
|
|
cmds=$finish_cmds
|
2001-09-11 07:33:26 +08:00
|
|
|
save_ifs="$IFS"; IFS='~'
|
1999-10-30 18:39:28 +08:00
|
|
|
for cmd in $cmds; do
|
|
|
|
IFS="$save_ifs"
|
2003-11-22 22:03:35 +08:00
|
|
|
eval cmd=\"$cmd\"
|
1999-10-30 18:39:28 +08:00
|
|
|
$show "$cmd"
|
|
|
|
$run eval "$cmd" || admincmds="$admincmds
|
|
|
|
$cmd"
|
|
|
|
done
|
|
|
|
IFS="$save_ifs"
|
|
|
|
fi
|
|
|
|
if test -n "$finish_eval"; then
|
|
|
|
# Do the single finish_eval.
|
|
|
|
eval cmds=\"$finish_eval\"
|
|
|
|
$run eval "$cmds" || admincmds="$admincmds
|
|
|
|
$cmds"
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Exit here if they wanted silent mode.
|
2004-02-12 20:27:46 +08:00
|
|
|
test "$show" = : && exit $EXIT_SUCCESS
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo "----------------------------------------------------------------------"
|
|
|
|
$echo "Libraries have been installed in:"
|
1999-10-30 18:39:28 +08:00
|
|
|
for libdir in $libdirs; do
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo " $libdir"
|
1999-10-30 18:39:28 +08:00
|
|
|
done
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo
|
|
|
|
$echo "If you ever happen to want to link against installed libraries"
|
|
|
|
$echo "in a given directory, LIBDIR, you must either use libtool, and"
|
|
|
|
$echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
|
|
|
|
$echo "flag during linking and do at least one of the following:"
|
1999-10-30 18:39:28 +08:00
|
|
|
if test -n "$shlibpath_var"; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
|
|
|
$echo " during execution"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
if test -n "$runpath_var"; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
|
|
|
$echo " during linking"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
if test -n "$hardcode_libdir_flag_spec"; then
|
|
|
|
libdir=LIBDIR
|
|
|
|
eval flag=\"$hardcode_libdir_flag_spec\"
|
|
|
|
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo " - use the \`$flag' linker flag"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
if test -n "$admincmds"; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo " - have your system administrator run these commands:$admincmds"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
if test -f /etc/ld.so.conf; then
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo
|
|
|
|
$echo "See any operating system documentation about shared libraries for"
|
|
|
|
$echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
|
|
|
$echo "----------------------------------------------------------------------"
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_SUCCESS
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
|
|
|
# libtool execute mode
|
|
|
|
execute)
|
|
|
|
modename="$modename: execute"
|
|
|
|
|
|
|
|
# The first argument is the command name.
|
|
|
|
cmd="$nonopt"
|
|
|
|
if test -z "$cmd"; then
|
|
|
|
$echo "$modename: you must specify a COMMAND" 1>&2
|
|
|
|
$echo "$help"
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Handle -dlopen flags immediately.
|
|
|
|
for file in $execute_dlfiles; do
|
|
|
|
if test ! -f "$file"; then
|
|
|
|
$echo "$modename: \`$file' is not a file" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
dir=
|
2001-03-06 04:08:09 +08:00
|
|
|
case $file in
|
1999-10-30 18:39:28 +08:00
|
|
|
*.la)
|
|
|
|
# Check to see that this really is a libtool archive.
|
2004-01-22 23:27:25 +08:00
|
|
|
if (${SED} -e '2q' $file | $GREP "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
|
|
|
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Read the libtool library.
|
|
|
|
dlname=
|
|
|
|
library_names=
|
|
|
|
|
|
|
|
# If there is no directory component, then add one.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $file in
|
1999-10-30 18:39:28 +08:00
|
|
|
*/* | *\\*) . $file ;;
|
|
|
|
*) . ./$file ;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
# Skip this library if it cannot be dlopened.
|
|
|
|
if test -z "$dlname"; then
|
|
|
|
# Warn if it was a shared library.
|
|
|
|
test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
|
|
|
|
dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
|
|
|
|
test "X$dir" = "X$file" && dir=.
|
|
|
|
|
|
|
|
if test -f "$dir/$objdir/$dlname"; then
|
|
|
|
dir="$dir/$objdir"
|
|
|
|
else
|
|
|
|
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
;;
|
|
|
|
|
|
|
|
*.lo)
|
|
|
|
# Just add the directory containing the .lo file.
|
|
|
|
dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
|
|
|
|
test "X$dir" = "X$file" && dir=.
|
|
|
|
;;
|
|
|
|
|
|
|
|
*)
|
|
|
|
$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
|
|
|
|
continue
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
# Get the absolute pathname.
|
|
|
|
absdir=`cd "$dir" && pwd`
|
|
|
|
test -n "$absdir" && dir="$absdir"
|
|
|
|
|
|
|
|
# Now add the directory to shlibpath_var.
|
|
|
|
if eval "test -z \"\$$shlibpath_var\""; then
|
|
|
|
eval "$shlibpath_var=\"\$dir\""
|
|
|
|
else
|
|
|
|
eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
|
|
|
# This variable tells wrapper scripts just to set shlibpath_var
|
|
|
|
# rather than running their programs.
|
|
|
|
libtool_execute_magic="$magic"
|
|
|
|
|
|
|
|
# Check if any of the arguments is a wrapper script.
|
|
|
|
args=
|
|
|
|
for file
|
|
|
|
do
|
2001-03-06 04:08:09 +08:00
|
|
|
case $file in
|
1999-10-30 18:39:28 +08:00
|
|
|
-*) ;;
|
|
|
|
*)
|
|
|
|
# Do a test to see if this is really a libtool program.
|
2004-01-22 23:27:25 +08:00
|
|
|
if (${SED} -e '4q' $file | $GREP "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
1999-10-30 18:39:28 +08:00
|
|
|
# If there is no directory component, then add one.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $file in
|
1999-10-30 18:39:28 +08:00
|
|
|
*/* | *\\*) . $file ;;
|
|
|
|
*) . ./$file ;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
# Transform arg to wrapped name.
|
|
|
|
file="$progdir/$program"
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
# Quote arguments (to preserve shell metacharacters).
|
|
|
|
file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
|
|
|
|
args="$args \"$file\""
|
|
|
|
done
|
|
|
|
|
|
|
|
if test -z "$run"; then
|
|
|
|
if test -n "$shlibpath_var"; then
|
2000-01-20 04:34:37 +08:00
|
|
|
# Export the shlibpath_var.
|
|
|
|
eval "export $shlibpath_var"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
2002-09-25 12:26:20 +08:00
|
|
|
# Restore saved environment variables
|
1999-10-30 18:39:28 +08:00
|
|
|
if test "${save_LC_ALL+set}" = set; then
|
|
|
|
LC_ALL="$save_LC_ALL"; export LC_ALL
|
|
|
|
fi
|
|
|
|
if test "${save_LANG+set}" = set; then
|
|
|
|
LANG="$save_LANG"; export LANG
|
|
|
|
fi
|
|
|
|
|
2001-06-26 04:42:45 +08:00
|
|
|
# Now prepare to actually exec the command.
|
2001-08-14 07:11:48 +08:00
|
|
|
exec_cmd="\$cmd$args"
|
1999-10-30 18:39:28 +08:00
|
|
|
else
|
|
|
|
# Display what would be done.
|
|
|
|
if test -n "$shlibpath_var"; then
|
2000-01-20 04:34:37 +08:00
|
|
|
eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
|
|
|
|
$echo "export $shlibpath_var"
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
$echo "$cmd$args"
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_SUCCESS
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
;;
|
|
|
|
|
2000-02-24 07:10:05 +08:00
|
|
|
# libtool clean and uninstall mode
|
|
|
|
clean | uninstall)
|
|
|
|
modename="$modename: $mode"
|
1999-10-30 18:39:28 +08:00
|
|
|
rm="$nonopt"
|
|
|
|
files=
|
2001-04-07 07:48:28 +08:00
|
|
|
rmforce=
|
|
|
|
exit_status=0
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-02-24 07:10:05 +08:00
|
|
|
# This variable tells wrapper scripts just to set variables rather
|
|
|
|
# than running their programs.
|
|
|
|
libtool_install_magic="$magic"
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
for arg
|
|
|
|
do
|
2001-03-06 04:08:09 +08:00
|
|
|
case $arg in
|
2001-04-07 07:48:28 +08:00
|
|
|
-f) rm="$rm $arg"; rmforce=yes ;;
|
1999-10-30 18:39:28 +08:00
|
|
|
-*) rm="$rm $arg" ;;
|
|
|
|
*) files="$files $arg" ;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
|
|
|
if test -z "$rm"; then
|
|
|
|
$echo "$modename: you must specify an RM program" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
|
2001-03-10 10:16:45 +08:00
|
|
|
rmdirs=
|
|
|
|
|
2003-03-22 14:46:07 +08:00
|
|
|
origobjdir="$objdir"
|
1999-10-30 18:39:28 +08:00
|
|
|
for file in $files; do
|
|
|
|
dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
|
2000-02-24 07:10:05 +08:00
|
|
|
if test "X$dir" = "X$file"; then
|
|
|
|
dir=.
|
2003-03-22 14:46:07 +08:00
|
|
|
objdir="$origobjdir"
|
2000-02-24 07:10:05 +08:00
|
|
|
else
|
2003-03-22 14:46:07 +08:00
|
|
|
objdir="$dir/$origobjdir"
|
2000-02-24 07:10:05 +08:00
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
|
2001-07-30 00:20:45 +08:00
|
|
|
test "$mode" = uninstall && objdir="$dir"
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2001-03-10 10:16:45 +08:00
|
|
|
# Remember objdir for removal later, being careful to avoid duplicates
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$mode" = clean; then
|
2001-04-25 04:30:21 +08:00
|
|
|
case " $rmdirs " in
|
2001-03-10 10:16:45 +08:00
|
|
|
*" $objdir "*) ;;
|
|
|
|
*) rmdirs="$rmdirs $objdir" ;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
2001-04-07 07:48:28 +08:00
|
|
|
# Don't error if the file doesn't exist and rm -f was used.
|
2004-02-13 07:47:46 +08:00
|
|
|
if (test -L "$file") >/dev/null 2>&1 ||
|
|
|
|
(test -h "$file") >/dev/null 2>&1 ||
|
|
|
|
test -f "$file"; then
|
2001-09-03 06:07:38 +08:00
|
|
|
:
|
2001-04-08 17:51:22 +08:00
|
|
|
elif test -d "$file"; then
|
2001-09-03 06:07:38 +08:00
|
|
|
exit_status=1
|
2001-04-08 17:51:22 +08:00
|
|
|
continue
|
|
|
|
elif test "$rmforce" = yes; then
|
2001-09-03 06:07:38 +08:00
|
|
|
continue
|
2001-04-07 07:48:28 +08:00
|
|
|
fi
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
rmfiles="$file"
|
|
|
|
|
2001-03-06 04:08:09 +08:00
|
|
|
case $name in
|
1999-10-30 18:39:28 +08:00
|
|
|
*.la)
|
|
|
|
# Possibly a libtool archive, so verify it.
|
2004-01-22 23:27:25 +08:00
|
|
|
if (${SED} -e '2q' $file | $GREP "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
1999-10-30 18:39:28 +08:00
|
|
|
. $dir/$name
|
|
|
|
|
|
|
|
# Delete the libtool libraries and symlinks.
|
|
|
|
for n in $library_names; do
|
2000-02-24 07:10:05 +08:00
|
|
|
rmfiles="$rmfiles $objdir/$n"
|
1999-10-30 18:39:28 +08:00
|
|
|
done
|
2000-02-24 07:10:05 +08:00
|
|
|
test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
|
2001-07-30 00:20:45 +08:00
|
|
|
test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$mode" = uninstall; then
|
2000-02-24 07:10:05 +08:00
|
|
|
if test -n "$library_names"; then
|
|
|
|
# Do each command in the postuninstall commands.
|
2003-11-22 22:03:35 +08:00
|
|
|
cmds=$postuninstall_cmds
|
2001-09-11 07:33:26 +08:00
|
|
|
save_ifs="$IFS"; IFS='~'
|
2000-02-24 07:10:05 +08:00
|
|
|
for cmd in $cmds; do
|
|
|
|
IFS="$save_ifs"
|
2003-11-22 22:03:35 +08:00
|
|
|
eval cmd=\"$cmd\"
|
2000-02-24 07:10:05 +08:00
|
|
|
$show "$cmd"
|
|
|
|
$run eval "$cmd"
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$?" -ne 0 && test "$rmforce" != yes; then
|
2001-04-07 07:48:28 +08:00
|
|
|
exit_status=1
|
|
|
|
fi
|
2000-02-24 07:10:05 +08:00
|
|
|
done
|
1999-10-30 18:39:28 +08:00
|
|
|
IFS="$save_ifs"
|
2000-02-24 07:10:05 +08:00
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2000-02-24 07:10:05 +08:00
|
|
|
if test -n "$old_library"; then
|
|
|
|
# Do each command in the old_postuninstall commands.
|
2003-11-22 22:03:35 +08:00
|
|
|
cmds=$old_postuninstall_cmds
|
2001-09-11 07:33:26 +08:00
|
|
|
save_ifs="$IFS"; IFS='~'
|
2000-02-24 07:10:05 +08:00
|
|
|
for cmd in $cmds; do
|
|
|
|
IFS="$save_ifs"
|
2003-11-22 22:03:35 +08:00
|
|
|
eval cmd=\"$cmd\"
|
2000-02-24 07:10:05 +08:00
|
|
|
$show "$cmd"
|
|
|
|
$run eval "$cmd"
|
2001-07-30 00:20:45 +08:00
|
|
|
if test "$?" -ne 0 && test "$rmforce" != yes; then
|
2001-04-07 07:48:28 +08:00
|
|
|
exit_status=1
|
|
|
|
fi
|
2000-02-24 07:10:05 +08:00
|
|
|
done
|
1999-10-30 18:39:28 +08:00
|
|
|
IFS="$save_ifs"
|
2000-02-24 07:10:05 +08:00
|
|
|
fi
|
|
|
|
# FIXME: should reinstall the best remaining shared library.
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
|
|
|
|
*.lo)
|
2001-05-28 07:20:45 +08:00
|
|
|
# Possibly a libtool object, so verify it.
|
2004-01-22 23:27:25 +08:00
|
|
|
if (${SED} -e '2q' $file | $GREP "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
2001-05-28 07:20:45 +08:00
|
|
|
|
2001-09-03 06:07:38 +08:00
|
|
|
# Read the .lo file
|
|
|
|
. $dir/$name
|
2001-05-28 07:20:45 +08:00
|
|
|
|
|
|
|
# Add PIC object to the list of files to remove.
|
2004-02-13 07:47:46 +08:00
|
|
|
if test -n "$pic_object" &&
|
|
|
|
test "$pic_object" != none; then
|
2001-05-28 07:20:45 +08:00
|
|
|
rmfiles="$rmfiles $dir/$pic_object"
|
2001-09-03 06:07:38 +08:00
|
|
|
fi
|
2001-05-28 07:20:45 +08:00
|
|
|
|
|
|
|
# Add non-PIC object to the list of files to remove.
|
2004-02-13 07:47:46 +08:00
|
|
|
if test -n "$non_pic_object" &&
|
|
|
|
test "$non_pic_object" != none; then
|
2001-05-28 07:20:45 +08:00
|
|
|
rmfiles="$rmfiles $dir/$non_pic_object"
|
2001-09-03 06:07:38 +08:00
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
fi
|
|
|
|
;;
|
|
|
|
|
|
|
|
*)
|
2003-01-29 12:53:18 +08:00
|
|
|
if test "$mode" = clean ; then
|
|
|
|
noexename=$name
|
|
|
|
case $file in
|
2003-09-10 16:40:42 +08:00
|
|
|
*.exe)
|
2003-03-21 04:24:21 +08:00
|
|
|
file=`$echo $file|${SED} 's,.exe$,,'`
|
|
|
|
noexename=`$echo $name|${SED} 's,.exe$,,'`
|
2003-01-29 12:53:18 +08:00
|
|
|
# $file with .exe has already been added to rmfiles,
|
|
|
|
# add $file without .exe
|
|
|
|
rmfiles="$rmfiles $file"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
# Do a test to see if this is a libtool program.
|
2004-01-22 23:27:25 +08:00
|
|
|
if (${SED} -e '4q' $file | $GREP "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
2003-01-29 12:53:18 +08:00
|
|
|
relink_command=
|
2003-03-22 14:46:07 +08:00
|
|
|
. $dir/$noexename
|
2000-02-24 07:10:05 +08:00
|
|
|
|
2003-01-29 12:53:18 +08:00
|
|
|
# note $name still contains .exe if it was in $file originally
|
|
|
|
# as does the version of $file that was added into $rmfiles
|
|
|
|
rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
|
|
|
|
if test "$fast_install" = yes && test -n "$relink_command"; then
|
|
|
|
rmfiles="$rmfiles $objdir/lt-$name"
|
|
|
|
fi
|
|
|
|
if test "X$noexename" != "X$name" ; then
|
|
|
|
rmfiles="$rmfiles $objdir/lt-${noexename}.c"
|
|
|
|
fi
|
2000-02-24 07:10:05 +08:00
|
|
|
fi
|
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
esac
|
2000-02-24 07:10:05 +08:00
|
|
|
$show "$rm $rmfiles"
|
2001-04-07 07:48:28 +08:00
|
|
|
$run $rm $rmfiles || exit_status=1
|
1999-10-30 18:39:28 +08:00
|
|
|
done
|
2003-03-22 14:46:07 +08:00
|
|
|
objdir="$origobjdir"
|
2001-03-10 10:16:45 +08:00
|
|
|
|
|
|
|
# Try to remove the ${objdir}s in the directories where we deleted files
|
|
|
|
for dir in $rmdirs; do
|
|
|
|
if test -d "$dir"; then
|
2001-04-25 04:30:21 +08:00
|
|
|
$show "rmdir $dir"
|
|
|
|
$run rmdir $dir >/dev/null 2>&1
|
2001-03-10 10:16:45 +08:00
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
2001-04-07 07:48:28 +08:00
|
|
|
exit $exit_status
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
|
|
|
"")
|
|
|
|
$echo "$modename: you must specify a MODE" 1>&2
|
|
|
|
$echo "$generic_help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2001-06-26 04:42:45 +08:00
|
|
|
if test -z "$exec_cmd"; then
|
|
|
|
$echo "$modename: invalid operation mode \`$mode'" 1>&2
|
|
|
|
$echo "$generic_help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2001-06-26 04:42:45 +08:00
|
|
|
fi
|
1999-10-30 18:39:28 +08:00
|
|
|
fi # test -z "$show_help"
|
|
|
|
|
2001-06-26 04:42:45 +08:00
|
|
|
if test -n "$exec_cmd"; then
|
2003-12-31 08:31:23 +08:00
|
|
|
eval exec "$exec_cmd"
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
2001-06-26 04:42:45 +08:00
|
|
|
fi
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# We need to display help for each of the modes.
|
2001-03-06 04:08:09 +08:00
|
|
|
case $mode in
|
1999-10-30 18:39:28 +08:00
|
|
|
"") $echo \
|
|
|
|
"Usage: $modename [OPTION]... [MODE-ARG]...
|
|
|
|
|
|
|
|
Provide generalized library-building support services.
|
|
|
|
|
2004-02-23 23:52:18 +08:00
|
|
|
--config show all configuration variables
|
|
|
|
--debug enable verbose shell tracing
|
|
|
|
-n, --dry-run display commands without modifying any files
|
|
|
|
--features display basic configuration information and exit
|
|
|
|
--finish same as \`--mode=finish'
|
|
|
|
--help display this help message and exit
|
|
|
|
--mode=MODE use operation mode MODE
|
|
|
|
--preserve-dup-deps don't remove duplicate dependency libraries
|
|
|
|
--quiet same as \`--silent'
|
|
|
|
--silent don't print informational messages
|
|
|
|
--tag=TAG use configuration variables from tag TAG
|
|
|
|
--version print version information
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
MODE must be one of the following:
|
|
|
|
|
|
|
|
clean remove files from the build directory
|
|
|
|
compile compile a source file into a libtool object
|
|
|
|
execute automatically set library path, then run a program
|
|
|
|
finish complete the installation of libtool libraries
|
|
|
|
install install libraries or executables
|
|
|
|
link create a library or an executable
|
|
|
|
uninstall remove libraries from an installed directory
|
|
|
|
|
|
|
|
MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for
|
2003-02-24 00:15:49 +08:00
|
|
|
a more detailed description of MODE.
|
|
|
|
|
|
|
|
Report bugs to <bug-libtool@gnu.org>."
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_SUCCESS
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
|
|
|
|
clean)
|
|
|
|
$echo \
|
|
|
|
"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
|
|
|
|
|
|
|
|
Remove files from the build directory.
|
|
|
|
|
|
|
|
RM is the name of the program to use to delete files associated with each FILE
|
|
|
|
(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
|
|
|
|
to RM.
|
|
|
|
|
|
|
|
If FILE is a libtool library, object or program, all the files associated
|
|
|
|
with it are deleted. Otherwise, only FILE itself is deleted using RM."
|
|
|
|
;;
|
|
|
|
|
|
|
|
compile)
|
|
|
|
$echo \
|
|
|
|
"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
|
|
|
|
|
|
|
|
Compile a source file into a libtool library object.
|
|
|
|
|
|
|
|
This mode accepts the following additional options:
|
|
|
|
|
|
|
|
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
|
2004-01-07 03:26:17 +08:00
|
|
|
-no-suppress do not suppress compiler output for multiple passes
|
2001-04-25 04:30:21 +08:00
|
|
|
-prefer-pic try to building PIC objects only
|
|
|
|
-prefer-non-pic try to building non-PIC objects only
|
2003-10-08 00:48:23 +08:00
|
|
|
-shared do not build a \`.o' file suitable for static linking
|
|
|
|
-static only build a \`.o' file suitable for static linking
|
1999-10-30 18:39:28 +08:00
|
|
|
|
|
|
|
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
|
|
|
|
from the given SOURCEFILE.
|
|
|
|
|
|
|
|
The output file name is determined by removing the directory component from
|
|
|
|
SOURCEFILE, then substituting the C source code suffix \`.c' with the
|
|
|
|
library object suffix, \`.lo'."
|
|
|
|
;;
|
|
|
|
|
|
|
|
execute)
|
|
|
|
$echo \
|
|
|
|
"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
|
|
|
|
|
|
|
|
Automatically set library path, then run a program.
|
|
|
|
|
|
|
|
This mode accepts the following additional options:
|
|
|
|
|
|
|
|
-dlopen FILE add the directory containing FILE to the library path
|
|
|
|
|
|
|
|
This mode sets the library path environment variable according to \`-dlopen'
|
|
|
|
flags.
|
|
|
|
|
|
|
|
If any of the ARGS are libtool executable wrappers, then they are translated
|
|
|
|
into their corresponding uninstalled binary, and any of their required library
|
|
|
|
directories are added to the library path.
|
|
|
|
|
|
|
|
Then, COMMAND is executed, with ARGS as arguments."
|
|
|
|
;;
|
|
|
|
|
|
|
|
finish)
|
|
|
|
$echo \
|
|
|
|
"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
|
|
|
|
|
|
|
|
Complete the installation of libtool libraries.
|
|
|
|
|
|
|
|
Each LIBDIR is a directory that contains libtool libraries.
|
|
|
|
|
|
|
|
The commands that this mode executes may require superuser privileges. Use
|
|
|
|
the \`--dry-run' option if you just want to see what would be executed."
|
|
|
|
;;
|
|
|
|
|
|
|
|
install)
|
|
|
|
$echo \
|
|
|
|
"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
|
|
|
|
|
|
|
|
Install executables or libraries.
|
|
|
|
|
|
|
|
INSTALL-COMMAND is the installation command. The first component should be
|
|
|
|
either the \`install' or \`cp' program.
|
|
|
|
|
2004-02-24 00:59:14 +08:00
|
|
|
The following components of INSTALL-COMMAND are treated specially:
|
|
|
|
|
|
|
|
-inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
The rest of the components are interpreted as arguments to that command (only
|
|
|
|
BSD-compatible install options are recognized)."
|
|
|
|
;;
|
|
|
|
|
|
|
|
link)
|
|
|
|
$echo \
|
|
|
|
"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
|
|
|
|
|
|
|
|
Link object files or libraries together to form another library, or to
|
|
|
|
create an executable program.
|
|
|
|
|
|
|
|
LINK-COMMAND is a command using the C compiler that you would use to create
|
|
|
|
a program from several object files.
|
|
|
|
|
|
|
|
The following components of LINK-COMMAND are treated specially:
|
|
|
|
|
|
|
|
-all-static do not do any dynamic linking at all
|
|
|
|
-avoid-version do not add a version suffix if possible
|
|
|
|
-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
|
|
|
|
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
|
|
|
|
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
|
|
|
|
-export-symbols SYMFILE
|
|
|
|
try to export only the symbols listed in SYMFILE
|
|
|
|
-export-symbols-regex REGEX
|
|
|
|
try to export only the symbols matching REGEX
|
|
|
|
-LLIBDIR search LIBDIR for required installed libraries
|
|
|
|
-lNAME OUTPUT-FILE requires the installed library libNAME
|
|
|
|
-module build a library that can dlopened
|
|
|
|
-no-fast-install disable the fast-install mode
|
|
|
|
-no-install link a not-installable executable
|
|
|
|
-no-undefined declare that a library does not refer to external symbols
|
|
|
|
-o OUTPUT-FILE create OUTPUT-FILE from the specified objects
|
2001-05-28 07:20:45 +08:00
|
|
|
-objectlist FILE Use a list of object files found in FILE to specify objects
|
2004-01-12 10:32:50 +08:00
|
|
|
-precious-files-regex REGEX
|
|
|
|
don't remove output files matching REGEX
|
1999-10-30 18:39:28 +08:00
|
|
|
-release RELEASE specify package release information
|
|
|
|
-rpath LIBDIR the created library will eventually be installed in LIBDIR
|
|
|
|
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
|
2003-10-08 00:48:23 +08:00
|
|
|
-shared only do dynamic linking of libtool libraries
|
2004-02-24 00:43:42 +08:00
|
|
|
-shrext SUFFIX override the standard shared library file extension
|
1999-10-30 18:39:28 +08:00
|
|
|
-static do not do any dynamic linking of libtool libraries
|
|
|
|
-version-info CURRENT[:REVISION[:AGE]]
|
|
|
|
specify library version info [each variable defaults to 0]
|
|
|
|
|
|
|
|
All other options (arguments beginning with \`-') are ignored.
|
|
|
|
|
|
|
|
Every other argument is treated as a filename. Files ending in \`.la' are
|
|
|
|
treated as uninstalled libtool libraries, other files are standard or library
|
|
|
|
object files.
|
|
|
|
|
|
|
|
If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
|
|
|
|
only library objects (\`.lo' files) may be specified, and \`-rpath' is
|
|
|
|
required, except when creating a convenience library.
|
|
|
|
|
|
|
|
If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
|
|
|
|
using \`ar' and \`ranlib', or on Windows using \`lib'.
|
|
|
|
|
|
|
|
If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
|
|
|
|
is created, otherwise an executable program is created."
|
|
|
|
;;
|
|
|
|
|
|
|
|
uninstall)
|
|
|
|
$echo \
|
|
|
|
"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
|
|
|
|
|
|
|
|
Remove libraries from an installation directory.
|
|
|
|
|
|
|
|
RM is the name of the program to use to delete files associated with each FILE
|
|
|
|
(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
|
|
|
|
to RM.
|
|
|
|
|
|
|
|
If FILE is a libtool library, all the files associated with it are deleted.
|
|
|
|
Otherwise, only FILE itself is deleted using RM."
|
|
|
|
;;
|
|
|
|
|
|
|
|
*)
|
|
|
|
$echo "$modename: invalid operation mode \`$mode'" 1>&2
|
|
|
|
$echo "$help" 1>&2
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_FAILURE
|
1999-10-30 18:39:28 +08:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2003-03-21 04:24:21 +08:00
|
|
|
$echo
|
1999-10-30 18:39:28 +08:00
|
|
|
$echo "Try \`$modename --help' for more information about other modes."
|
|
|
|
|
2004-02-12 20:27:46 +08:00
|
|
|
exit $EXIT_SUCCESS
|
1999-10-30 18:39:28 +08:00
|
|
|
|
2001-05-28 07:20:45 +08:00
|
|
|
# The TAGs below are defined such that we never get into a situation
|
|
|
|
# in which we disable both kinds of libraries. Given conflicting
|
|
|
|
# choices, we go for a static library, that is the most portable,
|
|
|
|
# since we can't tell whether shared libraries were disabled because
|
|
|
|
# the user asked for that or because the platform doesn't support
|
|
|
|
# them. This is particularly important on AIX, because we don't
|
|
|
|
# support having both static and shared libraries enabled at the same
|
|
|
|
# time on that platform, so we default to a shared-only configuration.
|
|
|
|
# If a disable-shared tag is given, we'll fallback to a static-only
|
|
|
|
# configuration. But we'll never go from static-only to shared-only.
|
|
|
|
|
|
|
|
# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
|
|
|
|
build_libtool_libs=no
|
|
|
|
build_old_libs=yes
|
|
|
|
# ### END LIBTOOL TAG CONFIG: disable-shared
|
|
|
|
|
|
|
|
# ### BEGIN LIBTOOL TAG CONFIG: disable-static
|
2003-03-21 04:24:21 +08:00
|
|
|
build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
|
2001-05-28 07:20:45 +08:00
|
|
|
# ### END LIBTOOL TAG CONFIG: disable-static
|
|
|
|
|
1999-10-30 18:39:28 +08:00
|
|
|
# Local Variables:
|
|
|
|
# mode:shell-script
|
|
|
|
# sh-indentation:2
|
|
|
|
# End:
|