mirror of
https://github.com/NLnetLabs/unbound.git
synced 2025-12-20 23:00:56 -05:00
ltmain from Fedora distro.
git-svn-id: file:///svn/unbound/trunk@4076 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
parent
553544feac
commit
02282ba679
1 changed files with 16 additions and 25 deletions
41
ltmain.sh
41
ltmain.sh
|
|
@ -31,7 +31,7 @@
|
||||||
|
|
||||||
PROGRAM=libtool
|
PROGRAM=libtool
|
||||||
PACKAGE=libtool
|
PACKAGE=libtool
|
||||||
VERSION="2.4.6 Debian-2.4.6-1"
|
VERSION=2.4.6
|
||||||
package_revision=2.4.6
|
package_revision=2.4.6
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1977,7 +1977,7 @@ func_version ()
|
||||||
# End:
|
# End:
|
||||||
|
|
||||||
# Set a version string.
|
# Set a version string.
|
||||||
scriptversion='(GNU libtool) 2.4.6 Debian-2.4.6-1'
|
scriptversion='(GNU libtool) 2.4.6'
|
||||||
|
|
||||||
|
|
||||||
# func_echo ARG...
|
# func_echo ARG...
|
||||||
|
|
@ -2068,12 +2068,12 @@ include the following information:
|
||||||
compiler: $LTCC
|
compiler: $LTCC
|
||||||
compiler flags: $LTCFLAGS
|
compiler flags: $LTCFLAGS
|
||||||
linker: $LD (gnu? $with_gnu_ld)
|
linker: $LD (gnu? $with_gnu_ld)
|
||||||
version: $progname $scriptversion
|
version: $progname (GNU libtool) 2.4.6
|
||||||
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
|
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
|
||||||
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
|
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
|
||||||
|
|
||||||
Report bugs to <bug-libtool@gnu.org>.
|
Report bugs to <bug-libtool@gnu.org>.
|
||||||
GNU libtool home page: <http://www.gnu.org/s/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/>."
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
@ -7272,13 +7272,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*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
|
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
|
||||||
# -specs=* GCC specs files
|
|
||||||
# -stdlib=* select c++ std lib with clang
|
# -stdlib=* select c++ std lib with clang
|
||||||
# -fsanitize=* Clang/GCC memory and address sanitizer
|
|
||||||
-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*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
|
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
|
||||||
-specs=*|-fsanitize=*)
|
|
||||||
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"
|
||||||
|
|
@ -7571,10 +7568,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 lib,dlpreopen = "$linkmode,$pass"; then
|
if test lib,dlpreopen = "$linkmode,$pass"; then
|
||||||
|
|
@ -7893,19 +7887,19 @@ 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"
|
||||||
tmp_libs=
|
|
||||||
for deplib in $dependency_libs; do
|
|
||||||
deplibs="$deplib $deplibs"
|
|
||||||
if $opt_preserve_dup_deps; then
|
|
||||||
case "$tmp_libs " in
|
|
||||||
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
func_append tmp_libs " $deplib"
|
|
||||||
done
|
|
||||||
elif test prog != "$linkmode" && test lib != "$linkmode"; then
|
elif test prog != "$linkmode" && test lib != "$linkmode"; then
|
||||||
func_fatal_error "'$lib' is not a convenience library"
|
func_fatal_error "'$lib' is not a convenience library"
|
||||||
fi
|
fi
|
||||||
|
tmp_libs=
|
||||||
|
for deplib in $dependency_libs; do
|
||||||
|
deplibs="$deplib $deplibs"
|
||||||
|
if $opt_preserve_dup_deps; then
|
||||||
|
case "$tmp_libs " in
|
||||||
|
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
func_append tmp_libs " $deplib"
|
||||||
|
done
|
||||||
continue
|
continue
|
||||||
fi # $pass = conv
|
fi # $pass = conv
|
||||||
|
|
||||||
|
|
@ -8829,9 +8823,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)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue