ltmain.sh | ltmain.sh | |||
---|---|---|---|---|
# libtool (GNU libtool) 2.4 | # libtool (GNU libtool) 2.4.2 | |||
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 | |||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, | |||
# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | # 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. | |||
# This is free software; see the source for copying conditions. There is N O | # This is free software; see the source for copying conditions. There is N O | |||
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOS E. | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOS E. | |||
# GNU Libtool is free software; you can redistribute it and/or modify | # GNU Libtool is free software; you can redistribute it and/or modify | |||
# it under the terms of the GNU General Public License as published by | # it under the terms of the GNU General Public License as published by | |||
# the Free Software Foundation; either version 2 of the License, or | # the Free Software Foundation; either version 2 of the License, or | |||
# (at your option) any later version. | # (at your option) any later version. | |||
# | # | |||
# As a special exception to the GNU General Public License, | # As a special exception to the GNU General Public License, | |||
# if you distribute this file as part of a program or library that | # if you distribute this file as part of a program or library that | |||
skipping to change at line 44 | skipping to change at line 44 | |||
# | # | |||
# --config show all configuration variables | # --config show all configuration variables | |||
# --debug enable verbose shell tracing | # --debug enable verbose shell tracing | |||
# -n, --dry-run display commands without modifying any files | # -n, --dry-run display commands without modifying any files | |||
# --features display basic configuration information and ex it | # --features display basic configuration information and ex it | |||
# --mode=MODE use operation mode MODE | # --mode=MODE use operation mode MODE | |||
# --preserve-dup-deps don't remove duplicate dependency libraries | # --preserve-dup-deps don't remove duplicate dependency libraries | |||
# --quiet, --silent don't print informational messages | # --quiet, --silent don't print informational messages | |||
# --no-quiet, --no-silent | # --no-quiet, --no-silent | |||
# print informational messages (default) | # print informational messages (default) | |||
# --no-warn don't display warning messages | ||||
# --tag=TAG use configuration variables from tag TAG | # --tag=TAG use configuration variables from tag TAG | |||
# -v, --verbose print more informational messages than default | # -v, --verbose print more informational messages than default | |||
# --no-verbose don't print the extra informational messages | # --no-verbose don't print the extra informational messages | |||
# --version print version information | # --version print version information | |||
# -h, --help, --help-all print short, long, or detailed help message | # -h, --help, --help-all print short, long, or detailed help message | |||
# | # | |||
# MODE must be one of the following: | # MODE must be one of the following: | |||
# | # | |||
# clean remove files from the build directory | # clean remove files from the build directory | |||
# compile compile a source file into a libtool object | # compile compile a source file into a libtool object | |||
skipping to change at line 72 | skipping to change at line 73 | |||
# Try `$progname --help --mode=MODE' for a more detailed description of MOD E. | # Try `$progname --help --mode=MODE' for a more detailed description of MOD E. | |||
# | # | |||
# When reporting a bug, please describe a test case to reproduce it and | # When reporting a bug, please describe a test case to reproduce it and | |||
# include the following information: | # include the following information: | |||
# | # | |||
# host-triplet: $host | # host-triplet: $host | |||
# shell: $SHELL | # shell: $SHELL | |||
# compiler: $LTCC | # compiler: $LTCC | |||
# compiler flags: $LTCFLAGS | # compiler flags: $LTCFLAGS | |||
# linker: $LD (gnu? $with_gnu_ld) | # linker: $LD (gnu? $with_gnu_ld) | |||
# $progname: (GNU libtool) 2.4 Debian-2.4-2 | # $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1 | |||
# automake: $automake_version | # automake: $automake_version | |||
# autoconf: $autoconf_version | # autoconf: $autoconf_version | |||
# | # | |||
# Report bugs to <bug-libtool@gnu.org>. | # Report bugs to <bug-libtool@gnu.org>. | |||
# GNU libtool home page: <http://www.gnu.org/software/libtool/>. | # GNU libtool home page: <http://www.gnu.org/software/libtool/>. | |||
# General help using GNU software: <http://www.gnu.org/gethelp/>. | # General help using GNU software: <http://www.gnu.org/gethelp/>. | |||
PROGRAM=libtool | PROGRAM=libtool | |||
PACKAGE=libtool | PACKAGE=libtool | |||
VERSION="2.4 Debian-2.4-2" | VERSION="2.4.2 Debian-2.4.2-1" | |||
TIMESTAMP="" | TIMESTAMP="" | |||
package_revision=1.3293 | package_revision=1.3337 | |||
# Be Bourne compatible | # Be Bourne compatible | |||
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |||
emulate sh | emulate sh | |||
NULLCMD=: | NULLCMD=: | |||
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | |||
# is contrary to our usage. Disable this feature. | # is contrary to our usage. Disable this feature. | |||
alias -g '${1+"$@"}'='"$@"' | alias -g '${1+"$@"}'='"$@"' | |||
setopt NO_GLOB_SUBST | setopt NO_GLOB_SUBST | |||
else | else | |||
skipping to change at line 136 | skipping to change at line 137 | |||
# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh | # 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 | # 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 | # the _XPG environment variable is not equal to 1 (one), the special | |||
# positional parameter $0, within a function call, is the name of the | # positional parameter $0, within a function call, is the name of the | |||
# function. | # function. | |||
progpath="$0" | progpath="$0" | |||
: ${CP="cp -f"} | : ${CP="cp -f"} | |||
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} | test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} | |||
: ${EGREP="/bin/grep -E"} | ||||
: ${FGREP="/bin/grep -F"} | ||||
: ${GREP="/bin/grep"} | ||||
: ${LN_S="ln -s"} | ||||
: ${MAKE="make"} | : ${MAKE="make"} | |||
: ${MKDIR="mkdir"} | : ${MKDIR="mkdir"} | |||
: ${MV="mv -f"} | : ${MV="mv -f"} | |||
: ${RM="rm -f"} | : ${RM="rm -f"} | |||
: ${SED="/bin/sed"} | ||||
: ${SHELL="${CONFIG_SHELL-/bin/sh}"} | : ${SHELL="${CONFIG_SHELL-/bin/sh}"} | |||
: ${Xsed="$SED -e 1s/^X//"} | : ${Xsed="$SED -e 1s/^X//"} | |||
# Global variables: | # Global variables: | |||
EXIT_SUCCESS=0 | EXIT_SUCCESS=0 | |||
EXIT_FAILURE=1 | EXIT_FAILURE=1 | |||
EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing . | EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing . | |||
EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. | EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. | |||
exit_status=$EXIT_SUCCESS | exit_status=$EXIT_SUCCESS | |||
skipping to change at line 383 | skipping to change at line 379 | |||
# Make sure we have an absolute path for reexecution: | # Make sure we have an absolute path for reexecution: | |||
case $progpath in | case $progpath in | |||
[\\/]*|[A-Za-z]:\\*) ;; | [\\/]*|[A-Za-z]:\\*) ;; | |||
*[\\/]*) | *[\\/]*) | |||
progdir=$func_dirname_result | progdir=$func_dirname_result | |||
progdir=`cd "$progdir" && pwd` | progdir=`cd "$progdir" && pwd` | |||
progpath="$progdir/$progname" | progpath="$progdir/$progname" | |||
;; | ;; | |||
*) | *) | |||
save_IFS="$IFS" | save_IFS="$IFS" | |||
IFS=: | IFS=${PATH_SEPARATOR-:} | |||
for progdir in $PATH; do | for progdir in $PATH; do | |||
IFS="$save_IFS" | IFS="$save_IFS" | |||
test -x "$progdir/$progname" && break | test -x "$progdir/$progname" && break | |||
done | done | |||
IFS="$save_IFS" | IFS="$save_IFS" | |||
test -n "$progdir" || progdir=`pwd` | test -n "$progdir" || progdir=`pwd` | |||
progpath="$progdir/$progname" | progpath="$progdir/$progname" | |||
;; | ;; | |||
esac | esac | |||
skipping to change at line 759 | skipping to change at line 755 | |||
s/^# // | s/^# // | |||
s/^# *$// | s/^# *$// | |||
s*\$progname*'$progname'* | s*\$progname*'$progname'* | |||
s*\$host*'"$host"'* | s*\$host*'"$host"'* | |||
s*\$SHELL*'"$SHELL"'* | s*\$SHELL*'"$SHELL"'* | |||
s*\$LTCC*'"$LTCC"'* | s*\$LTCC*'"$LTCC"'* | |||
s*\$LTCFLAGS*'"$LTCFLAGS"'* | s*\$LTCFLAGS*'"$LTCFLAGS"'* | |||
s*\$LD*'"$LD"'* | s*\$LD*'"$LD"'* | |||
s/\$with_gnu_ld/'"$with_gnu_ld"'/ | s/\$with_gnu_ld/'"$with_gnu_ld"'/ | |||
s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"' | s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null | |||
/ | |$SED 1q`"'/ | |||
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"' | s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null | |||
/ | |$SED 1q`"'/ | |||
p | p | |||
d | d | |||
} | } | |||
/^# .* home page:/b print | /^# .* home page:/b print | |||
/^# General help using/b print | /^# General help using/b print | |||
' < "$progpath" | ' < "$progpath" | |||
ret=$? | ret=$? | |||
if test -z "$1"; then | if test -z "$1"; then | |||
exit $ret | exit $ret | |||
fi | fi | |||
skipping to change at line 1025 | skipping to change at line 1021 | |||
# Option defaults: | # Option defaults: | |||
opt_debug=: | opt_debug=: | |||
opt_dry_run=false | opt_dry_run=false | |||
opt_config=false | opt_config=false | |||
opt_preserve_dup_deps=false | opt_preserve_dup_deps=false | |||
opt_features=false | opt_features=false | |||
opt_finish=false | opt_finish=false | |||
opt_help=false | opt_help=false | |||
opt_help_all=false | opt_help_all=false | |||
opt_silent=: | opt_silent=: | |||
opt_warning=: | ||||
opt_verbose=: | opt_verbose=: | |||
opt_silent=false | opt_silent=false | |||
opt_verbose=false | opt_verbose=false | |||
# Parse options once, thoroughly. This comes as soon as possible in the | # Parse options once, thoroughly. This comes as soon as possible in the | |||
# script to make things like `--version' happen as quickly as we can. | # script to make things like `--version' happen as quickly as we can. | |||
{ | { | |||
# this just eases exit handling | # this just eases exit handling | |||
while test $# -gt 0; do | while test $# -gt 0; do | |||
opt="$1" | opt="$1" | |||
skipping to change at line 1092 | skipping to change at line 1089 | |||
exit_cmd=exit | exit_cmd=exit | |||
break | break | |||
;; | ;; | |||
esac | esac | |||
shift | shift | |||
;; | ;; | |||
--no-silent|--no-quiet) | --no-silent|--no-quiet) | |||
opt_silent=false | opt_silent=false | |||
func_append preserve_args " $opt" | func_append preserve_args " $opt" | |||
;; | ;; | |||
--no-warning|--no-warn) | ||||
opt_warning=false | ||||
func_append preserve_args " $opt" | ||||
;; | ||||
--no-verbose) | --no-verbose) | |||
opt_verbose=false | opt_verbose=false | |||
func_append preserve_args " $opt" | func_append preserve_args " $opt" | |||
;; | ;; | |||
--silent|--quiet) | --silent|--quiet) | |||
opt_silent=: | opt_silent=: | |||
func_append preserve_args " $opt" | func_append preserve_args " $opt" | |||
opt_verbose=false | opt_verbose=false | |||
;; | ;; | |||
--verbose|-v) | --verbose|-v) | |||
skipping to change at line 1996 | skipping to change at line 1997 | |||
} | } | |||
;; | ;; | |||
esac | esac | |||
# Recognize several different file suffixes. | # Recognize several different file suffixes. | |||
# If the user specifies -o file.o, it is replaced with file.lo | # If the user specifies -o file.o, it is replaced with file.lo | |||
case $libobj in | case $libobj in | |||
*.[cCFSifmso] | \ | *.[cCFSifmso] | \ | |||
*.ada | *.adb | *.ads | *.asm | \ | *.ada | *.adb | *.ads | *.asm | \ | |||
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ | *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ | |||
*.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) | *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) | |||
func_xform "$libobj" | func_xform "$libobj" | |||
libobj=$func_xform_result | libobj=$func_xform_result | |||
;; | ;; | |||
esac | esac | |||
case $libobj in | case $libobj in | |||
*.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; | *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; | |||
*) | *) | |||
func_fatal_error "cannot determine name of library object from \`$lib obj'" | func_fatal_error "cannot determine name of library object from \`$lib obj'" | |||
;; | ;; | |||
skipping to change at line 3135 | skipping to change at line 3136 | |||
;; | ;; | |||
esac | esac | |||
done | done | |||
for file in $staticlibs; do | for file in $staticlibs; do | |||
func_basename "$file" | func_basename "$file" | |||
name="$func_basename_result" | name="$func_basename_result" | |||
# Set up the ranlib parameters. | # Set up the ranlib parameters. | |||
oldlib="$destdir/$name" | oldlib="$destdir/$name" | |||
func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 | ||||
tool_oldlib=$func_to_tool_file_result | ||||
func_show_eval "$install_prog \$file \$oldlib" 'exit $?' | func_show_eval "$install_prog \$file \$oldlib" 'exit $?' | |||
if test -n "$stripme" && test -n "$old_striplib"; then | if test -n "$stripme" && test -n "$old_striplib"; then | |||
func_show_eval "$old_striplib $oldlib" 'exit $?' | func_show_eval "$old_striplib $tool_oldlib" 'exit $?' | |||
fi | fi | |||
# Do each command in the postinstall commands. | # Do each command in the postinstall commands. | |||
func_execute_cmds "$old_postinstall_cmds" 'exit $?' | func_execute_cmds "$old_postinstall_cmds" 'exit $?' | |||
done | done | |||
test -n "$future_libdirs" && \ | test -n "$future_libdirs" && \ | |||
func_warning "remember to run \`$progname --finish$future_libdirs'" | func_warning "remember to run \`$progname --finish$future_libdirs'" | |||
if test -n "$current_libdirs"; then | if test -n "$current_libdirs"; then | |||
skipping to change at line 3403 | skipping to change at line 3406 | |||
pic_flag_for_symtable= | pic_flag_for_symtable= | |||
case "$compile_command " in | case "$compile_command " in | |||
*" -static "*) ;; | *" -static "*) ;; | |||
*) | *) | |||
case $host in | case $host in | |||
# compiling the symbol table file with pic_flag works around | # compiling the symbol table file with pic_flag works around | |||
# a FreeBSD bug that causes programs to crash when -lm is | # a FreeBSD bug that causes programs to crash when -lm is | |||
# linked before any other PIC object. But we must not use | # linked before any other PIC object. But we must not use | |||
# pic_flag when linking with -static. The problem exists in | # pic_flag when linking with -static. The problem exists in | |||
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. | # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. | |||
*-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) | *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) | |||
pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; | pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; | |||
*-*-hpux*) | *-*-hpux*) | |||
pic_flag_for_symtable=" $pic_flag" ;; | pic_flag_for_symtable=" $pic_flag" ;; | |||
*) | *) | |||
if test "X$my_pic_p" != Xno; then | if test "X$my_pic_p" != Xno; then | |||
pic_flag_for_symtable=" $pic_flag" | pic_flag_for_symtable=" $pic_flag" | |||
fi | fi | |||
;; | ;; | |||
esac | esac | |||
;; | ;; | |||
skipping to change at line 3912 | skipping to change at line 3915 | |||
$ECHO "\ | $ECHO "\ | |||
\$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 | \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 | |||
exit 1 | exit 1 | |||
} | } | |||
# A function to encapsulate launching the target application | # A function to encapsulate launching the target application | |||
# Strips options in the --lt-* namespace from \$@ and | # Strips options in the --lt-* namespace from \$@ and | |||
# launches target application with the remaining arguments. | # launches target application with the remaining arguments. | |||
func_exec_program () | func_exec_program () | |||
{ | { | |||
for lt_wr_arg | case \" \$* \" in | |||
do | *\\ --lt-*) | |||
case \$lt_wr_arg in | for lt_wr_arg | |||
--lt-*) ;; | do | |||
*) set x \"\$@\" \"\$lt_wr_arg\"; shift;; | case \$lt_wr_arg in | |||
esac | --lt-*) ;; | |||
shift | *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; | |||
done | esac | |||
shift | ||||
done ;; | ||||
esac | ||||
func_exec_program_core \${1+\"\$@\"} | func_exec_program_core \${1+\"\$@\"} | |||
} | } | |||
# Parse options | # Parse options | |||
func_parse_lt_options \"\$0\" \${1+\"\$@\"} | func_parse_lt_options \"\$0\" \${1+\"\$@\"} | |||
# Find the directory that this script lives in. | # Find the directory that this script lives in. | |||
thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` | thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` | |||
test \"x\$thisdir\" = \"x\$file\" && thisdir=. | test \"x\$thisdir\" = \"x\$file\" && thisdir=. | |||
skipping to change at line 4985 | skipping to change at line 4991 | |||
} | } | |||
EOF | EOF | |||
;; | ;; | |||
esac | esac | |||
cat <<"EOF" | cat <<"EOF" | |||
void lt_dump_script (FILE* f) | void lt_dump_script (FILE* f) | |||
{ | { | |||
EOF | EOF | |||
func_emit_wrapper yes | | func_emit_wrapper yes | | |||
$SED -e 's/\([\\"]\)/\\\1/g' \ | $SED -n -e ' | |||
-e 's/^/ fputs ("/' -e 's/$/\\n", f);/' | s/^\(.\{79\}\)\(..*\)/\1\ | |||
\2/ | ||||
h | ||||
s/\([\\"]\)/\\\1/g | ||||
s/$/\\n/ | ||||
s/\([^\n]*\).*/ fputs ("\1", f);/p | ||||
g | ||||
D' | ||||
cat <<"EOF" | cat <<"EOF" | |||
} | } | |||
EOF | EOF | |||
} | } | |||
# end: func_emit_cwrapperexe_src | # end: func_emit_cwrapperexe_src | |||
# func_win32_import_lib_p ARG | # func_win32_import_lib_p ARG | |||
# True if ARG is an import lib, as indicated by $file_magic_cmd | # True if ARG is an import lib, as indicated by $file_magic_cmd | |||
func_win32_import_lib_p () | func_win32_import_lib_p () | |||
{ | { | |||
skipping to change at line 5571 | skipping to change at line 5583 | |||
# classes, name mangling, and exception handling. | # classes, name mangling, and exception handling. | |||
# Darwin uses the -arch flag to determine output architecture. | # Darwin uses the -arch flag to determine output architecture. | |||
-model|-arch|-isysroot|--sysroot) | -model|-arch|-isysroot|--sysroot) | |||
func_append compiler_flags " $arg" | func_append compiler_flags " $arg" | |||
func_append compile_command " $arg" | func_append compile_command " $arg" | |||
func_append finalize_command " $arg" | func_append finalize_command " $arg" | |||
prev=xcompiler | prev=xcompiler | |||
continue | continue | |||
;; | ;; | |||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-thr | -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ | |||
eads) | |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) | |||
func_append compiler_flags " $arg" | func_append compiler_flags " $arg" | |||
func_append compile_command " $arg" | func_append compile_command " $arg" | |||
func_append finalize_command " $arg" | func_append finalize_command " $arg" | |||
case "$new_inherited_linker_flags " in | case "$new_inherited_linker_flags " in | |||
*" $arg "*) ;; | *" $arg "*) ;; | |||
* ) func_append new_inherited_linker_flags " $arg" ;; | * ) func_append new_inherited_linker_flags " $arg" ;; | |||
esac | esac | |||
continue | continue | |||
;; | ;; | |||
skipping to change at line 6078 | skipping to change at line 6091 | |||
if test "$pass" = dlopen; then | if test "$pass" = dlopen; then | |||
# Collect dlpreopened libraries | # Collect dlpreopened libraries | |||
save_deplibs="$deplibs" | save_deplibs="$deplibs" | |||
deplibs= | deplibs= | |||
fi | fi | |||
for deplib in $libs; do | for deplib in $libs; do | |||
lib= | lib= | |||
found=no | found=no | |||
case $deplib in | case $deplib in | |||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-th | -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ | |||
reads) | |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) | |||
if test "$linkmode,$pass" = "prog,link"; then | if test "$linkmode,$pass" = "prog,link"; then | |||
compile_deplibs="$deplib $compile_deplibs" | compile_deplibs="$deplib $compile_deplibs" | |||
finalize_deplibs="$deplib $finalize_deplibs" | finalize_deplibs="$deplib $finalize_deplibs" | |||
else | else | |||
func_append compiler_flags " $deplib" | func_append compiler_flags " $deplib" | |||
if test "$linkmode" = lib ; then | if test "$linkmode" = lib ; then | |||
case "$new_inherited_linker_flags " in | case "$new_inherited_linker_flags " in | |||
*" $deplib "*) ;; | *" $deplib "*) ;; | |||
* ) func_append new_inherited_linker_flags " $deplib" ;; | * ) func_append new_inherited_linker_flags " $deplib" ;; | |||
esac | esac | |||
skipping to change at line 6759 | skipping to change at line 6773 | |||
add="-l$name" | add="-l$name" | |||
else | else | |||
lib_linked=no | lib_linked=no | |||
fi | fi | |||
;; | ;; | |||
relink) | relink) | |||
if test "$hardcode_direct" = yes && | if test "$hardcode_direct" = yes && | |||
test "$hardcode_direct_absolute" = no; then | test "$hardcode_direct_absolute" = no; then | |||
add="$dir/$linklib" | add="$dir/$linklib" | |||
elif test "$hardcode_minus_L" = yes; then | elif test "$hardcode_minus_L" = yes; then | |||
add_dir="-L$dir" | add_dir="-L$absdir" | |||
# Try looking first in the location we're being installed to . | # Try looking first in the location we're being installed to . | |||
if test -n "$inst_prefix_dir"; then | if test -n "$inst_prefix_dir"; then | |||
case $libdir in | case $libdir in | |||
[\\/]*) | [\\/]*) | |||
func_append add_dir " -L$inst_prefix_dir$libdir" | func_append add_dir " -L$inst_prefix_dir$libdir" | |||
;; | ;; | |||
esac | esac | |||
fi | fi | |||
add="-l$name" | add="-l$name" | |||
elif test "$hardcode_shlibpath_var" = yes; then | elif test "$hardcode_shlibpath_var" = yes; then | |||
skipping to change at line 7244 | skipping to change at line 7258 | |||
number_minor="$2" | number_minor="$2" | |||
number_revision="$3" | number_revision="$3" | |||
# | # | |||
# There are really only two kinds -- those that | # There are really only two kinds -- those that | |||
# use the current revision as the major version | # use the current revision as the major version | |||
# and those that subtract age and use age as | # and those that subtract age and use age as | |||
# a minor version. But, then there is irix | # a minor version. But, then there is irix | |||
# which has an extra 1 added just for fun | # which has an extra 1 added just for fun | |||
# | # | |||
case $version_type in | case $version_type in | |||
# correct linux to gnu/linux during the next big refactor | ||||
darwin|linux|osf|windows|none) | darwin|linux|osf|windows|none) | |||
func_arith $number_major + $number_minor | func_arith $number_major + $number_minor | |||
current=$func_arith_result | current=$func_arith_result | |||
age="$number_minor" | age="$number_minor" | |||
revision="$number_revision" | revision="$number_revision" | |||
;; | ;; | |||
freebsd-aout|freebsd-elf|qnx|sunos) | freebsd-aout|freebsd-elf|qnx|sunos) | |||
current="$number_major" | current="$number_major" | |||
revision="$number_minor" | revision="$number_minor" | |||
age="0" | age="0" | |||
skipping to change at line 7363 | skipping to change at line 7378 | |||
func_arith $loop - 1 | func_arith $loop - 1 | |||
loop=$func_arith_result | loop=$func_arith_result | |||
verstring="$verstring_prefix$major.$iface:$verstring" | verstring="$verstring_prefix$major.$iface:$verstring" | |||
done | done | |||
# Before this point, $major must not contain `.'. | # Before this point, $major must not contain `.'. | |||
major=.$major | major=.$major | |||
versuffix="$major.$revision" | versuffix="$major.$revision" | |||
;; | ;; | |||
linux) | linux) # correct to gnu/linux during the next big refactor | |||
func_arith $current - $age | func_arith $current - $age | |||
major=.$func_arith_result | major=.$func_arith_result | |||
versuffix="$major.$age.$revision" | versuffix="$major.$age.$revision" | |||
;; | ;; | |||
osf) | osf) | |||
func_arith $current - $age | func_arith $current - $age | |||
major=.$func_arith_result | major=.$func_arith_result | |||
versuffix=".$current.$age.$revision" | versuffix=".$current.$age.$revision" | |||
verstring="$current.$age.$revision" | verstring="$current.$age.$revision" | |||
skipping to change at line 7951 | skipping to change at line 7966 | |||
done | done | |||
deplibs="$new_libs" | deplibs="$new_libs" | |||
# All the library-specific variables (install_libdir is set above). | # All the library-specific variables (install_libdir is set above). | |||
library_names= | library_names= | |||
old_library= | old_library= | |||
dlname= | dlname= | |||
# Test again, we may have decided not to build it any more | # Test again, we may have decided not to build it any more | |||
if test "$build_libtool_libs" = yes; then | if test "$build_libtool_libs" = yes; then | |||
# Remove ${wl} instances when linking with ld. | ||||
# FIXME: should test the right _cmds variable. | ||||
case $archive_cmds in | ||||
*\$LD\ *) wl= ;; | ||||
esac | ||||
if test "$hardcode_into_libs" = yes; then | if test "$hardcode_into_libs" = yes; then | |||
# Hardcode the library paths | # Hardcode the library paths | |||
hardcode_libdirs= | hardcode_libdirs= | |||
dep_rpath= | dep_rpath= | |||
rpath="$finalize_rpath" | rpath="$finalize_rpath" | |||
test "$opt_mode" != relink && rpath="$compile_rpath$rpath" | test "$opt_mode" != relink && rpath="$compile_rpath$rpath" | |||
for libdir in $rpath; do | for libdir in $rpath; do | |||
if test -n "$hardcode_libdir_flag_spec"; then | if test -n "$hardcode_libdir_flag_spec"; then | |||
if test -n "$hardcode_libdir_separator"; then | if test -n "$hardcode_libdir_separator"; then | |||
func_replace_sysroot "$libdir" | func_replace_sysroot "$libdir" | |||
skipping to change at line 7981 | skipping to change at line 8001 | |||
;; | ;; | |||
esac | esac | |||
fi | fi | |||
else | else | |||
eval flag=\"$hardcode_libdir_flag_spec\" | eval flag=\"$hardcode_libdir_flag_spec\" | |||
func_append dep_rpath " $flag" | func_append dep_rpath " $flag" | |||
fi | fi | |||
elif test -n "$runpath_var"; then | elif test -n "$runpath_var"; then | |||
case "$perm_rpath " in | case "$perm_rpath " in | |||
*" $libdir "*) ;; | *" $libdir "*) ;; | |||
*) func_apped perm_rpath " $libdir" ;; | *) func_append perm_rpath " $libdir" ;; | |||
esac | esac | |||
fi | fi | |||
done | done | |||
# Substitute the hardcoded libdirs into the rpath. | # Substitute the hardcoded libdirs into the rpath. | |||
if test -n "$hardcode_libdir_separator" && | if test -n "$hardcode_libdir_separator" && | |||
test -n "$hardcode_libdirs"; then | test -n "$hardcode_libdirs"; then | |||
libdir="$hardcode_libdirs" | libdir="$hardcode_libdirs" | |||
if test -n "$hardcode_libdir_flag_spec_ld"; then | eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" | |||
eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" | ||||
else | ||||
eval dep_rpath=\"$hardcode_libdir_flag_spec\" | ||||
fi | ||||
fi | fi | |||
if test -n "$runpath_var" && test -n "$perm_rpath"; then | if test -n "$runpath_var" && test -n "$perm_rpath"; then | |||
# We should set the runpath_var. | # We should set the runpath_var. | |||
rpath= | rpath= | |||
for dir in $perm_rpath; do | for dir in $perm_rpath; do | |||
func_append rpath "$dir:" | func_append rpath "$dir:" | |||
done | done | |||
eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" | eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" | |||
fi | fi | |||
test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" | test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" | |||
skipping to change at line 9081 | skipping to change at line 9097 | |||
*) if test ! -f "$gentop/$newobj"; then break; fi ;; | *) if test ! -f "$gentop/$newobj"; then break; fi ;; | |||
esac | esac | |||
done | done | |||
func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$ne wobj" | func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$ne wobj" | |||
func_append oldobjs " $gentop/$newobj" | func_append oldobjs " $gentop/$newobj" | |||
;; | ;; | |||
*) func_append oldobjs " $obj" ;; | *) func_append oldobjs " $obj" ;; | |||
esac | esac | |||
done | done | |||
fi | fi | |||
func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 | ||||
tool_oldlib=$func_to_tool_file_result | ||||
eval cmds=\"$old_archive_cmds\" | eval cmds=\"$old_archive_cmds\" | |||
func_len " $cmds" | func_len " $cmds" | |||
len=$func_len_result | len=$func_len_result | |||
if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; the n | if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; the n | |||
cmds=$old_archive_cmds | cmds=$old_archive_cmds | |||
elif test -n "$archiver_list_spec"; then | elif test -n "$archiver_list_spec"; then | |||
func_verbose "using command file archive linking..." | func_verbose "using command file archive linking..." | |||
for obj in $oldobjs | for obj in $oldobjs | |||
do | do | |||
skipping to change at line 9190 | skipping to change at line 9208 | |||
break | break | |||
fi | fi | |||
output="$output_objdir/$outputname"i | output="$output_objdir/$outputname"i | |||
# Replace all uninstalled libtool libraries with the installed o nes | # Replace all uninstalled libtool libraries with the installed o nes | |||
newdependency_libs= | newdependency_libs= | |||
for deplib in $dependency_libs; do | for deplib in $dependency_libs; do | |||
case $deplib in | case $deplib in | |||
*.la) | *.la) | |||
func_basename "$deplib" | func_basename "$deplib" | |||
name="$func_basename_result" | name="$func_basename_result" | |||
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` | func_resolve_sysroot "$deplib" | |||
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_res | ||||
olve_sysroot_result` | ||||
test -z "$libdir" && \ | test -z "$libdir" && \ | |||
func_fatal_error "\`$deplib' is not a valid libtool archiv e" | func_fatal_error "\`$deplib' is not a valid libtool archiv e" | |||
func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$na me" | func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$na me" | |||
;; | ;; | |||
-L*) | -L*) | |||
func_stripname -L '' "$deplib" | func_stripname -L '' "$deplib" | |||
func_replace_sysroot "$func_stripname_result" | func_replace_sysroot "$func_stripname_result" | |||
func_append newdependency_libs " -L$func_replace_sysroot_res ult" | func_append newdependency_libs " -L$func_replace_sysroot_res ult" | |||
;; | ;; | |||
-R*) | -R*) | |||
End of changes. 28 change blocks. | ||||
42 lines changed or deleted | 60 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ |