[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: darwin 5.5 echo probes leaving empty SHELL
From: |
Peter O'Gorman |
Subject: |
Re: darwin 5.5 echo probes leaving empty SHELL |
Date: |
Wed, 2 Apr 2003 10:48:50 +0900 |
Here it is, note that I reduced the size of the patch to what is
absolutely necessary figuring the less I touch, the less I can break.
darwin < 6 users please test.
Thanks,
Peter
diff -urN libtool.cvs/ChangeLog libtool.pogma/ChangeLog
--- libtool.cvs/ChangeLog Wed Apr 2 08:39:24 2003
+++ libtool.pogma/ChangeLog Wed Apr 2 08:44:45 2003
@@ -1,3 +1,8 @@
+2003-04-01 Peter O'Gorman <address@hidden>
+
+ * libtool.m4: Fix the echo test which I broke earlier.
+ * ltmain.in: Make DESTDIR work on darwin, don't use otool.
+
2003-03-31 Keith Packard <address@hidden>
* ltmain.in: New flag -version-number to be used for maintaining
diff -urN libtool.cvs/libtool.m4 libtool.pogma/libtool.m4
--- libtool.cvs/libtool.m4 Sun Mar 30 23:40:46 2003
+++ libtool.pogma/libtool.m4 Wed Apr 2 08:44:45 2003
@@ -392,6 +400,8 @@
:
elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0"
--fallback-echo '\t') 2>/dev/null` &&
test "X$echo_testing_string" = 'X\t' &&
+ eval echo_test_var=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo
'\\\t') 2>/dev/null` &&
+ test "X$echo_test_var" = "X\t" &&
echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0"
--fallback-echo "$echo_test_string") 2>/dev/null` &&
test "X$echo_testing_string" = "X$echo_test_string"; then
CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
@@ -401,6 +411,8 @@
echo="$CONFIG_SHELL [$]0 --fallback-echo"
elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo
'\t') 2>/dev/null` &&
test "X$echo_testing_string" = 'X\t' &&
+ eval echo_test_var=`($CONFIG_SHELL "[$]0" --fallback-echo '\\\t')
2>/dev/null` &&
+ test "X$echo_test_var" = "X\t" &&
echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo
"$echo_test_string") 2>/dev/null` &&
test "X$echo_testing_string" = "X$echo_test_string"; then
echo="$CONFIG_SHELL [$]0 --fallback-echo"
diff -urN libtool.cvs/ltmain.in libtool.pogma/ltmain.in
--- libtool.cvs/ltmain.in Wed Apr 2 08:39:24 2003
+++ libtool.pogma/ltmain.in Wed Apr 2 08:44:45 2003
@@ -2319,7 +2319,7 @@
*-*-darwin* )
# if the lib is a module then we can not link against it,
someone
# is ignoring the new warnings I added
- if test -z `otool -XD $add` ; then
+ if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null
; then
$echo "** Warning, lib $linklib is a module, not a shared
library"
if test -z "$old_library" ; then
$echo
@@ -2411,6 +2411,12 @@
*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
esac
add="-l$name"
+ elif test "$hardcode_automatic" = yes; then
+ if test -n "$inst_prefix_dir" && test -f
"$inst_prefix_dir$libdir/$linklib" ; then
+ add="$inst_prefix_dir$libdir/$linklib"
+ else
+ add="$libdir/$linklib"
+ fi
else
# We cannot seem to hardcode it, guess we'll fake it.
add_dir="-L$libdir"
darwin.8.diff.gz
Description: GNU Zip compressed data
- darwin 5.5 echo probes leaving empty SHELL, Kevin Ryde, 2003/04/01
- RE: darwin 5.5 echo probes leaving empty SHELL, Boehne, Robert, 2003/04/01
- RE: darwin 5.5 echo probes leaving empty SHELL, Boehne, Robert, 2003/04/01
- Re: darwin 5.5 echo probes leaving empty SHELL,
Peter O'Gorman <=
- RE: darwin 5.5 echo probes leaving empty SHELL, Boehne, Robert, 2003/04/02