Ralf Wildenhues wrote:
[ taking out bug-libtool ]
Also, can't we eliminate the extra process? How about a grep for
`: [^:]* bundle' instead, given above? (Watch out, ltmain.m4sh needs
the brackets m4-quoted!)
Worked for me too. I have just applied the following patches to branch-1-5
and HEAD.
Christoph, could you do me a favor and try to ensure that your patches have
a text type so that I can see them inline in my mailer?
application/octet-stream with base64 encoding is a little annoying.
Thanks for the report and testing. And thanks Ralf for the patch :)
Peter
Index: ChangeLog
from Ralf Wildenhues <[EMAIL PROTECTED]>
* ltmain.in [darwin]: Don't check for "bundle" in file path.
Reported by Christoph Egger <[EMAIL PROTECTED]>.
Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/ltmain.in,v
retrieving revision 1.334.2.89
diff -u -3 -p -u -r1.334.2.89 ltmain.in
--- ltmain.in 25 Sep 2005 07:37:09 -0000 1.334.2.89
+++ ltmain.in 17 Oct 2005 14:05:13 -0000
@@ -2565,7 +2565,8 @@ EOF
*-*-darwin* )
# if the lib is a module then we can not link against
# it, someone is ignoring the new warnings I added
- if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle"
>/dev/null ; then
+ if /usr/bin/file -L $add 2> /dev/null |
+ $EGREP ": [^:]* bundle" >/dev/null ; then
$echo "** Warning, lib $linklib is a module, not a shared
library"
if test -z "$old_library" ; then
$echo
Index: ChangeLog
from Ralf Wildenhues <[EMAIL PROTECTED]>
* libltdl/config/ltmain.m4sh [darwin]: Don't check for "bundle"
in file path.
Reported by Christoph Egger <[EMAIL PROTECTED]>.
Index: libltdl/config/ltmain.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/config/ltmain.m4sh,v
retrieving revision 1.13
diff -u -3 -p -u -r1.13 ltmain.m4sh
--- libltdl/config/ltmain.m4sh 30 Sep 2005 08:41:48 -0000 1.13
+++ libltdl/config/ltmain.m4sh 17 Oct 2005 14:05:27 -0000
@@ -3720,7 +3720,7 @@ func_mode_link ()
# if the lib is a (non-dlopened) module then we can not
# link against it, someone is ignoring the earlier warnings
if /usr/bin/file -L $add 2> /dev/null |
- $GREP "bundle" >/dev/null ; then
+ $GREP ": [[^:]]* bundle" >/dev/null ; then
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a
shared library"
if test -z "$old_library" ; then
