projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cobble a temporary changelog entry to keep this test build straight
[debian/gnuradio]
/
ltmain.sh
diff --git
a/ltmain.sh
b/ltmain.sh
index a72f2fd78bfc86bb35a404d1954c4ca9bb923c06..d88da2c264c8c312b286a83ae06d688d5287361a 100755
(executable)
--- a/
ltmain.sh
+++ b/
ltmain.sh
@@
-65,7
+65,7
@@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6b
+# $progname: (GNU libtool) 2.2.6b
Debian-2.2.6b-2
# automake: $automake_version
# autoconf: $autoconf_version
#
# automake: $automake_version
# autoconf: $autoconf_version
#
@@
-73,7
+73,7
@@
PROGRAM=ltmain.sh
PACKAGE=libtool
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=
2.2.6b
+VERSION=
"2.2.6b Debian-2.2.6b-2"
TIMESTAMP=""
package_revision=1.3017
TIMESTAMP=""
package_revision=1.3017
@@
-5033,7
+5033,10
@@
func_mode_link ()
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@
-5344,19
+5347,19
@@
func_mode_link ()
# 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"
# 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"
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_duplicate_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_duplicate_deps ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- fi
- tmp_libs="$tmp_libs $deplib"
- done
continue
fi # $pass = conv
continue
fi # $pass = conv
@@
-5893,6
+5896,7
@@
func_mode_link ()
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
+ path=
case $deplib in
-L*) path="$deplib" ;;
*.la)
case $deplib in
-L*) path="$deplib" ;;
*.la)
@@
-6206,6
+6210,9
@@
func_mode_link ()
revision="$number_minor"
lt_irix_increment=no
;;
revision="$number_minor"
lt_irix_increment=no
;;
+ *)
+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+ ;;
esac
;;
no)
esac
;;
no)