collabvm/r3
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

check in missing files

Browse source
This commit is contained in:
c9s 2014-05-17 15:54:38 +08:00
parent 3b811952d9
commit 9557af5efa
6 changed files with 105 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.gitignore vendored
View file

@ -17,12 +17,12 @@ tags
*.la *.la
*.dylib *.dylib
*.o *.o
/aclocal.m4 # /aclocal.m4
/autom4te.cache # /autom4te.cache
/compile # /compile
/configure # /configure
/depcomp # /depcomp
/install-sh # /install-sh
/missing # /missing
/stamp-h1 # /stamp-h1
Makefile.in # Makefile.in

1
config.guess vendored Symbolic link
View file

@ -0,0 +1 @@
/opt/local/share/automake-1.14/config.guess

3
config.status
View file

@ -393,7 +393,7 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
" "
# Files that config.status was made for. # Files that config.status was made for.
config_files=" Makefile src/Makefile tests/Makefile" config_files=" r3.pc Makefile src/Makefile tests/Makefile"
config_headers=" config.h" config_headers=" config.h"
config_commands=" depfiles libtool" config_commands=" depfiles libtool"
@ -744,6 +744,7 @@ do
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"r3.pc") CONFIG_FILES="$CONFIG_FILES r3.pc" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;

1
config.sub vendored Symbolic link
View file

@ -0,0 +1 @@
/opt/local/share/automake-1.14/config.sub

140
libtool
View file

@ -1,8 +1,8 @@
#! /bin/bash #! /bin/sh
# libtool - Provide generalized library-building support services. # libtool - Provide generalized library-building support services.
# Generated automatically by config.status (r3) 1.0 # Generated automatically by config.status (r3) 1.0
# Libtool was configured on host node3.corneltek.com: # Libtool was configured on host c9smba.local:
# NOTE: Changes made to this file will be lost: look at ltmain.sh. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
# #
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@ -53,10 +53,10 @@ build_old_libs=yes
pic_mode=default pic_mode=default
# Whether or not to optimize for fast installation. # Whether or not to optimize for fast installation.
fast_install=yes fast_install=needless
# Shell to use when invoking shell scripts. # Shell to use when invoking shell scripts.
SHELL="/bin/bash" SHELL="/bin/sh"
# An echo program that protects backslashes. # An echo program that protects backslashes.
ECHO="printf %s\\n" ECHO="printf %s\\n"
@ -66,37 +66,37 @@ PATH_SEPARATOR=":"
# The host system. # The host system.
host_alias= host_alias=
host=x86_64-unknown-linux-gnu host=x86_64-apple-darwin13.1.0
host_os=linux-gnu host_os=darwin13.1.0
# The build system. # The build system.
build_alias= build_alias=
build=x86_64-unknown-linux-gnu build=x86_64-apple-darwin13.1.0
build_os=linux-gnu build_os=darwin13.1.0
# A sed program that does not truncate output. # A sed program that does not truncate output.
SED="/bin/sed" SED="/opt/local/bin/gsed"
# Sed that helps us avoid accidentally triggering echo(1) options like -n. # Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed="$SED -e 1s/^X//" Xsed="$SED -e 1s/^X//"
# A grep program that handles long lines. # A grep program that handles long lines.
GREP="/bin/grep" GREP="/usr/bin/grep"
# An ERE matcher. # An ERE matcher.
EGREP="/bin/grep -E" EGREP="/usr/bin/grep -E"
# A literal string matcher. # A literal string matcher.
FGREP="/bin/grep -F" FGREP="/usr/bin/grep -F"
# A BSD- or MS-compatible name lister. # A BSD- or MS-compatible name lister.
NM="/usr/bin/nm -B" NM="/opt/local/bin/nm"
# Whether we need soft or hard links. # Whether we need soft or hard links.
LN_S="ln -s" LN_S="ln -s"
# What is the maximum length of a command? # What is the maximum length of a command?
max_cmd_len=1572864 max_cmd_len=196608
# Object file suffix (normally "o"). # Object file suffix (normally "o").
objext=o objext=o
@ -120,7 +120,7 @@ to_host_file_cmd=func_convert_file_noop
to_tool_file_cmd=func_convert_file_noop to_tool_file_cmd=func_convert_file_noop
# An object symbol dumper. # An object symbol dumper.
OBJDUMP="objdump" OBJDUMP="false"
# Method to check whether dependent libraries are shared objects. # Method to check whether dependent libraries are shared objects.
deplibs_check_method="pass_all" deplibs_check_method="pass_all"
@ -147,7 +147,7 @@ AR="ar"
AR_FLAGS="cru" AR_FLAGS="cru"
# How to feed a file listing to the archiver. # How to feed a file listing to the archiver.
archiver_list_spec="@" archiver_list_spec=""
# A symbol stripping program. # A symbol stripping program.
STRIP="strip" STRIP="strip"
@ -158,28 +158,28 @@ old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$tool_oldlib"
old_postuninstall_cmds="" old_postuninstall_cmds=""
# Whether to use a lock for old archive extraction. # Whether to use a lock for old archive extraction.
lock_old_archive_extraction=no lock_old_archive_extraction=yes
# A C compiler. # A C compiler.
LTCC="gcc -std=gnu99" LTCC="gcc"
# LTCC compiler flags. # LTCC compiler flags.
LTCFLAGS="-g -O2" LTCFLAGS="-g -O2"
# Take the output of nm and produce a listing of raw symbols and C names. # Take the output of nm and produce a listing of raw symbols and C names.
global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'" global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BCDEGRST][BCDEGRST]*\\)[ ][ ]*_\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 _\\2 \\2/p' | sed '/ __gnu_lto/d'"
# Transform the output of nm in a proper C declaration. # Transform the output of nm in a proper C declaration.
global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e 's/^[ABCDGIRSTW]* .* \\(.*\\)\$/extern char \\1;/p'" global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e 's/^[BCDEGRST]* .* \\(.*\\)\$/extern char \\1;/p'"
# Transform the output of nm in a C name address pair. # Transform the output of nm in a C name address pair.
global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p'" global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p'"
# Transform the output of nm in a C name address pair when lib prefix is needed. # Transform the output of nm in a C name address pair when lib prefix is needed.
global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\(lib[^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"lib\\2\", (void *) \\&\\2},/p'" global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\(lib[^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"lib\\2\", (void *) \\&\\2},/p'"
# Specify filename containing input files for $NM. # Specify filename containing input files for $NM.
nm_file_list_spec="@" nm_file_list_spec=""
# The root where to search for dependent libraries,and in which our libraries should be installed. # The root where to search for dependent libraries,and in which our libraries should be installed.
lt_sysroot= lt_sysroot=
@ -197,32 +197,32 @@ need_locks="no"
MANIFEST_TOOL=":" MANIFEST_TOOL=":"
# Tool to manipulate archived DWARF debug symbol files on Mac OS X. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
DSYMUTIL="" DSYMUTIL="dsymutil"
# Tool to change global to local symbols on Mac OS X. # Tool to change global to local symbols on Mac OS X.
NMEDIT="" NMEDIT="nmedit"
# Tool to manipulate fat objects and archives on Mac OS X. # Tool to manipulate fat objects and archives on Mac OS X.
LIPO="" LIPO="lipo"
# ldd/readelf like tool for Mach-O binaries on Mac OS X. # ldd/readelf like tool for Mach-O binaries on Mac OS X.
OTOOL="" OTOOL="otool"
# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. # ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
OTOOL64="" OTOOL64=":"
# Old archive suffix (normally "a"). # Old archive suffix (normally "a").
libext=a libext=a
# Shared library suffix (normally ".so"). # Shared library suffix (normally ".so").
shrext_cmds=".so" shrext_cmds="\`test .\$module = .yes && echo .so || echo .dylib\`"
# The commands to extract the exported symbol list from a shared archive. # The commands to extract the exported symbol list from a shared archive.
extract_expsyms_cmds="" extract_expsyms_cmds=""
# Variables whose values should be saved in libtool wrapper scripts and # Variables whose values should be saved in libtool wrapper scripts and
# restored at link time. # restored at link time.
variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" variables_saved_for_relink="PATH DYLD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
# Do we need the "lib" prefix for modules? # Do we need the "lib" prefix for modules?
need_lib_prefix=no need_lib_prefix=no
@ -231,26 +231,26 @@ need_lib_prefix=no
need_version=no need_version=no
# Library versioning type. # Library versioning type.
version_type=linux version_type=darwin
# Shared library runtime path variable. # Shared library runtime path variable.
runpath_var=LD_RUN_PATH runpath_var=
# Shared library path variable. # Shared library path variable.
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=DYLD_LIBRARY_PATH
# Is shlibpath searched before the hard-coded library search path? # Is shlibpath searched before the hard-coded library search path?
shlibpath_overrides_runpath=no shlibpath_overrides_runpath=yes
# Format of library name prefix. # Format of library name prefix.
libname_spec="lib\$name" libname_spec="lib\$name"
# List of archive names. First name is the real one, the rest are links. # List of archive names. First name is the real one, the rest are links.
# The last name is the one that the linker finds with -lNAME # The last name is the one that the linker finds with -lNAME
library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" library_names_spec="\${libname}\${release}\${major}\$shared_ext \${libname}\$shared_ext"
# The coded name of the library, if different from the real name. # The coded name of the library, if different from the real name.
soname_spec="\${libname}\${release}\${shared_ext}\$major" soname_spec="\${libname}\${release}\${major}\$shared_ext"
# Permission mode override for installation of shared libraries. # Permission mode override for installation of shared libraries.
install_override_mode="" install_override_mode=""
@ -262,20 +262,20 @@ postinstall_cmds=""
postuninstall_cmds="" postuninstall_cmds=""
# Commands used to finish a libtool library installation in a directory. # Commands used to finish a libtool library installation in a directory.
finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir" finish_cmds=""
# As "finish_cmds", except a single script fragment to be evaled but # As "finish_cmds", except a single script fragment to be evaled but
# not shown. # not shown.
finish_eval="" finish_eval=""
# Whether we should hardcode library paths into libraries. # Whether we should hardcode library paths into libraries.
hardcode_into_libs=yes hardcode_into_libs=no
# Compile-time system search path for libraries. # Compile-time system search path for libraries.
sys_lib_search_path_spec="/usr/lib/gcc/x86_64-linux-gnu/4.8 /usr/lib/x86_64-linux-gnu /usr/lib /lib/x86_64-linux-gnu /lib " sys_lib_search_path_spec="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1 /usr/local/lib"
# Run-time system search path for libraries. # Run-time system search path for libraries.
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu/mesa " sys_lib_dlsearch_path_spec="/usr/local/lib /lib /usr/lib"
# Whether dlopen is supported. # Whether dlopen is supported.
dlopen_support=unknown dlopen_support=unknown
@ -287,16 +287,16 @@ dlopen_self=unknown
dlopen_self_static=unknown dlopen_self_static=unknown
# Commands to strip libraries. # Commands to strip libraries.
old_striplib="strip --strip-debug" old_striplib="strip -S"
striplib="strip --strip-unneeded" striplib="strip -x"
# The linker used to build libraries. # The linker used to build libraries.
LD="/usr/bin/ld -m elf_x86_64" LD="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld"
# How to create reloadable object files. # How to create reloadable object files.
reload_flag=" -r" reload_flag=" -r"
reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" reload_cmds="\$LTCC \$LTCFLAGS -nostdlib \${wl}-r -o \$output\$reload_objs"
# Commands used to build an old-style archive. # Commands used to build an old-style archive.
old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib" old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"
@ -308,16 +308,16 @@ CC="gcc"
with_gcc=yes with_gcc=yes
# Compiler flag to turn off builtin functions. # Compiler flag to turn off builtin functions.
no_builtin_flag=" -fno-builtin" no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions"
# Additional compiler flags for building library objects. # Additional compiler flags for building library objects.
pic_flag=" -fPIC -DPIC" pic_flag=" -fno-common -DPIC"
# How to pass a linker flag through the compiler. # How to pass a linker flag through the compiler.
wl="-Wl," wl="-Wl,"
# Compiler flag to prevent dynamic linking. # Compiler flag to prevent dynamic linking.
link_static_flag="-static" link_static_flag=""
# Does compiler simultaneously support -c and -o options? # Does compiler simultaneously support -c and -o options?
compiler_c_o="yes" compiler_c_o="yes"
@ -329,10 +329,10 @@ build_libtool_need_lc=no
allow_libtool_libs_with_static_runtimes=no allow_libtool_libs_with_static_runtimes=no
# Compiler flag to allow reflexive dlopens. # Compiler flag to allow reflexive dlopens.
export_dynamic_flag_spec="\${wl}--export-dynamic" export_dynamic_flag_spec=""
# Compiler flag to generate shared objects directly from archives. # Compiler flag to generate shared objects directly from archives.
whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive" whole_archive_flag_spec="\`for conv in \$convenience\\\"\\\"; do test -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience \${wl}-force_load,\$conv\\\"; done; func_echo_all \\\"\$new_convenience\\\"\`"
# Whether the compiler copes with passing no objects directly. # Whether the compiler copes with passing no objects directly.
compiler_needs_object="no" compiler_needs_object="no"
@ -344,29 +344,26 @@ old_archive_from_new_cmds=""
old_archive_from_expsyms_cmds="" old_archive_from_expsyms_cmds=""
# Commands used to build a shared archive. # Commands used to build a shared archive.
archive_cmds="\$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib" archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module"
archive_expsym_cmds="echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~
echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
\$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
# Commands used to build a loadable module if different from building # Commands used to build a loadable module if different from building
# a shared archive. # a shared archive.
module_cmds="" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags"
module_expsym_cmds="" module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
# Whether we are building with GNU ld or not. # Whether we are building with GNU ld or not.
with_gnu_ld="yes" with_gnu_ld="no"
# Flag that allows shared libraries with undefined symbols to be built. # Flag that allows shared libraries with undefined symbols to be built.
allow_undefined_flag="" allow_undefined_flag="\${wl}-undefined \${wl}dynamic_lookup"
# Flag that enforces no undefined symbols. # Flag that enforces no undefined symbols.
no_undefined_flag="" no_undefined_flag=""
# Flag to hardcode $libdir into a binary during linking. # Flag to hardcode $libdir into a binary during linking.
# This must work even if $libdir does not exist # This must work even if $libdir does not exist
hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir" hardcode_libdir_flag_spec=""
# Whether we need a single "-rpath" flag with a separated argument. # Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator="" hardcode_libdir_separator=""
@ -392,14 +389,14 @@ hardcode_shlibpath_var=unsupported
# Set to "yes" if building a shared library automatically hardcodes DIR # Set to "yes" if building a shared library automatically hardcodes DIR
# into the library and all subsequent libraries and executables linked # into the library and all subsequent libraries and executables linked
# against it. # against it.
hardcode_automatic=no hardcode_automatic=yes
# Set to yes if linker adds runtime paths of dependent libraries # Set to yes if linker adds runtime paths of dependent libraries
# to runtime path list. # to runtime path list.
inherit_rpath=no inherit_rpath=no
# Whether libtool must link a program against all its dependency libraries. # Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=no link_all_deplibs=yes
# Set to "yes" if exported symbols are required. # Set to "yes" if exported symbols are required.
always_export_symbols=no always_export_symbols=no
@ -499,7 +496,7 @@ hardcode_action=immediate
# 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.2 Debian-2.4.2-1.3ubuntu1 # $progname: (GNU libtool) 2.4.2
# automake: $automake_version # automake: $automake_version
# autoconf: $autoconf_version # autoconf: $autoconf_version
# #
@ -509,7 +506,7 @@ hardcode_action=immediate
PROGRAM=libtool PROGRAM=libtool
PACKAGE=libtool PACKAGE=libtool
VERSION="2.4.2 Debian-2.4.2-1.3ubuntu1" VERSION=2.4.2
TIMESTAMP="" TIMESTAMP=""
package_revision=1.3337 package_revision=1.3337
@ -6273,9 +6270,10 @@ func_mode_link ()
# -tp=* Portland pgcc target processor selection # -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support # --sysroot=* for sysroot support
# -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
# -stdlib=* select c++ std lib with clang
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-O*|-flto*|-fwhopr*|-fuse-linker-plugin) -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-stdlib=*)
func_quote_for_eval "$arg" func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result" arg="$func_quote_for_eval_result"
compile_command+=" $arg" compile_command+=" $arg"
@ -6546,10 +6544,7 @@ func_mode_link ()
case $pass in case $pass in
dlopen) libs="$dlfiles" ;; dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;; dlpreopen) libs="$dlprefiles" ;;
link) link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
libs="$deplibs %DEPLIBS%"
test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
;;
esac esac
fi fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then if test "$linkmode,$pass" = "lib,dlpreopen"; then
@ -6869,6 +6864,9 @@ func_mode_link ()
# It is a libtool convenience library, so add in its objects. # It is a libtool convenience library, so add in its objects.
convenience+=" $ladir/$objdir/$old_library" convenience+=" $ladir/$objdir/$old_library"
old_convenience+=" $ladir/$objdir/$old_library" old_convenience+=" $ladir/$objdir/$old_library"
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
tmp_libs= tmp_libs=
for deplib in $dependency_libs; do for deplib in $dependency_libs; do
deplibs="$deplib $deplibs" deplibs="$deplib $deplibs"
@ -6879,9 +6877,6 @@ func_mode_link ()
fi fi
tmp_libs+=" $deplib" tmp_libs+=" $deplib"
done done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
continue continue
fi # $pass = conv fi # $pass = conv
@ -7774,9 +7769,6 @@ func_mode_link ()
revision="$number_minor" revision="$number_minor"
lt_irix_increment=no lt_irix_increment=no
;; ;;
*)
func_fatal_configuration "$modename: unknown library version type \`$version_type'"
;;
esac esac
;; ;;
no) no)

21
ltmain.sh
View file

@ -70,7 +70,7 @@
# 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.2 Debian-2.4.2-1.3ubuntu1 # $progname: (GNU libtool) 2.4.2
# automake: $automake_version # automake: $automake_version
# autoconf: $autoconf_version # autoconf: $autoconf_version
# #
@ -80,7 +80,7 @@
PROGRAM=libtool PROGRAM=libtool
PACKAGE=libtool PACKAGE=libtool
VERSION="2.4.2 Debian-2.4.2-1.3ubuntu1" VERSION=2.4.2
TIMESTAMP="" TIMESTAMP=""
package_revision=1.3337 package_revision=1.3337
@ -5851,9 +5851,10 @@ func_mode_link ()
# -tp=* Portland pgcc target processor selection # -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support # --sysroot=* for sysroot support
# -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
# -stdlib=* select c++ std lib with clang
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-O*|-flto*|-fwhopr*|-fuse-linker-plugin) -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-stdlib=*)
func_quote_for_eval "$arg" func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result" arg="$func_quote_for_eval_result"
func_append compile_command " $arg" func_append compile_command " $arg"
@ -6124,10 +6125,7 @@ func_mode_link ()
case $pass in case $pass in
dlopen) libs="$dlfiles" ;; dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;; dlpreopen) libs="$dlprefiles" ;;
link) link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
libs="$deplibs %DEPLIBS%"
test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
;;
esac esac
fi fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then if test "$linkmode,$pass" = "lib,dlpreopen"; then
@ -6447,6 +6445,9 @@ func_mode_link ()
# It is a libtool convenience library, so add in its objects. # It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library" func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library"
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
tmp_libs= tmp_libs=
for deplib in $dependency_libs; do for deplib in $dependency_libs; do
deplibs="$deplib $deplibs" deplibs="$deplib $deplibs"
@ -6457,9 +6458,6 @@ func_mode_link ()
fi fi
func_append tmp_libs " $deplib" func_append tmp_libs " $deplib"
done done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
continue continue
fi # $pass = conv fi # $pass = conv
@ -7352,9 +7350,6 @@ func_mode_link ()
revision="$number_minor" revision="$number_minor"
lt_irix_increment=no lt_irix_increment=no
;; ;;
*)
func_fatal_configuration "$modename: unknown library version type \`$version_type'"
;;
esac esac
;; ;;
no) no)