| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192 |
- --- a/ltmain.sh 2014-07-31 10:43:01.634568799 -0300
- +++ b/ltmain.sh 2014-07-31 10:44:14.032018999 -0300
- @@ -226,8 +226,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
- @@ -247,6 +248,11 @@
- arg="$1"
- shift
-
- + # Make -static behave as -all-static
- + case $arg in
- + -static) arg="-all-static" ;;
- + esac
- +
- case $arg in
- -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- @@ -1238,7 +1244,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"
- @@ -2146,8 +2153,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
- else
- dir="$ladir/$objdir"
- @@ -2272,7 +2285,7 @@
- { test "$prefer_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
-
- @@ -5169,6 +5182,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%^.*/%%'`
- @@ -5487,10 +5504,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.
|
