summaryrefslogtreecommitdiffstats
path: root/heimdall/ltmain.sh
diff options
context:
space:
mode:
authorBenjamin Dobell <benjamin.dobell+git@glassechidna.com.au>2014-06-01 06:49:56 +0200
committerBenjamin Dobell <benjamin.dobell+git@glassechidna.com.au>2014-06-01 06:49:56 +0200
commitfbebc394f441e35e4777868627b4d2d1ec349a6b (patch)
treeb58d6cdde289e3c5315c69438ab9eb54b08f0e3d /heimdall/ltmain.sh
parentFixed support for large files (up to 2^32 - 1 bytes) (diff)
downloadHeimdall-fbebc394f441e35e4777868627b4d2d1ec349a6b.tar
Heimdall-fbebc394f441e35e4777868627b4d2d1ec349a6b.tar.gz
Heimdall-fbebc394f441e35e4777868627b4d2d1ec349a6b.tar.bz2
Heimdall-fbebc394f441e35e4777868627b4d2d1ec349a6b.tar.lz
Heimdall-fbebc394f441e35e4777868627b4d2d1ec349a6b.tar.xz
Heimdall-fbebc394f441e35e4777868627b4d2d1ec349a6b.tar.zst
Heimdall-fbebc394f441e35e4777868627b4d2d1ec349a6b.zip
Diffstat (limited to '')
-rw-r--r--heimdall/ltmain.sh32
1 files changed, 19 insertions, 13 deletions
diff --git a/heimdall/ltmain.sh b/heimdall/ltmain.sh
index 63ae69d..c2852d8 100644
--- a/heimdall/ltmain.sh
+++ b/heimdall/ltmain.sh
@@ -70,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2
+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -80,7 +80,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.4.2
+VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
TIMESTAMP=""
package_revision=1.3337
@@ -6124,7 +6124,10 @@ func_mode_link ()
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
@@ -6444,19 +6447,19 @@ func_mode_link ()
# It is a libtool convenience library, so add in its objects.
func_append 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 "$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_preserve_dup_deps ; then
- case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- esac
- fi
- func_append tmp_libs " $deplib"
- done
continue
fi # $pass = conv
@@ -7349,6 +7352,9 @@ func_mode_link ()
revision="$number_minor"
lt_irix_increment=no
;;
+ *)
+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+ ;;
esac
;;
no)