| --- a/ltmain.sh 2008-02-01 17:39:51.000000000 +0100 |
| +++ b/ltmain.sh 2014-07-30 22:36:00.544715335 +0200 |
| @@ -297,8 +297,9 @@ |
| # line option must be used. |
| if test -z "$tagname"; then |
| $echo "$modename: unable to infer tagged configuration" |
| - $echo "$modename: specify a tag with \`--tag'" 1>&2 |
| - exit $EXIT_FAILURE |
| + $echo "$modename: defaulting to \`CC'" |
| + $echo "$modename: if this is not correct, specify a tag with \`--tag'" |
| +# exit $EXIT_FAILURE |
| # else |
| # $echo "$modename: using $tagname tagged configuration" |
| fi |
| @@ -1178,7 +1179,8 @@ |
| case $arg in |
| -all-static | -static | -static-libtool-libs) |
| case $arg in |
| - -all-static) |
| + # Make -static behave like -all-static |
| + -all-static | -static) |
| if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then |
| $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 |
| fi |
| @@ -1187,12 +1189,6 @@ |
| fi |
| prefer_static_libs=yes |
| ;; |
| - -static) |
| - if test -z "$pic_flag" && test -n "$link_static_flag"; then |
| - dlopen_self=$dlopen_self_static |
| - fi |
| - prefer_static_libs=built |
| - ;; |
| -static-libtool-libs) |
| if test -z "$pic_flag" && test -n "$link_static_flag"; then |
| dlopen_self=$dlopen_self_static |
| @@ -1482,7 +1478,8 @@ |
| prevarg="$arg" |
| |
| case $arg in |
| - -all-static) |
| + # Make -static behave like -all-static |
| + -all-static | -static) |
| if test -n "$link_static_flag"; then |
| compile_command="$compile_command $link_static_flag" |
| finalize_command="$finalize_command $link_static_flag" |
| @@ -1765,7 +1762,7 @@ |
| continue |
| ;; |
| |
| - -static | -static-libtool-libs) |
| + -static-libtool-libs) |
| # The effects of -static are defined in a previous loop. |
| # We used to do the same as -all-static on platforms that |
| # didn't have a PIC flag, but the assumption that the effects |
| @@ -2462,8 +2459,14 @@ |
| absdir="$abs_ladir" |
| libdir="$abs_ladir" |
| else |
| - dir="$libdir" |
| - absdir="$libdir" |
| + # Adding 'libdir' from the .la file to our library search paths |
| + # breaks crosscompilation horribly. We cheat here and don't add |
| + # it, instead adding the path where we found the .la. -CL |
| + dir="$abs_ladir" |
| + absdir="$abs_ladir" |
| + libdir="$abs_ladir" |
| + #dir="$libdir" |
| + #absdir="$libdir" |
| fi |
| test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes |
| else |
| @@ -2602,7 +2605,7 @@ |
| { test "$use_static_libs" = no || test -z "$old_library"; }; then |
| if test "$installed" = no; then |
| notinst_deplibs="$notinst_deplibs $lib" |
| - need_relink=yes |
| + need_relink=no |
| fi |
| # This is a shared library |
| |
| @@ -5687,6 +5690,10 @@ |
| # Replace all uninstalled libtool libraries with the installed ones |
| newdependency_libs= |
| for deplib in $dependency_libs; do |
| + # Replacing uninstalled with installed can easily break crosscompilation, |
| + # since the installed path is generally the wrong architecture. -CL |
| + newdependency_libs="$newdependency_libs $deplib" |
| + continue |
| case $deplib in |
| *.la) |
| name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` |
| @@ -6008,10 +6015,13 @@ |
| # At present, this check doesn't affect windows .dll's that |
| # are installed into $libdir/../bin (currently, that works fine) |
| # but it's something to keep an eye on. |
| - if test "$inst_prefix_dir" = "$destdir"; then |
| - $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 |
| - exit $EXIT_FAILURE |
| - fi |
| + # |
| + # This breaks install into our staging area. -PB |
| + # |
| + # if test "$inst_prefix_dir" = "$destdir"; then |
| + # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 |
| + # exit $EXIT_FAILURE |
| + # fi |
| |
| if test -n "$inst_prefix_dir"; then |
| # Stick the inst_prefix_dir data into the link command. |
