Re: libtool-1.5.2 fails when there's a ~ in CC

[Peter O'Gorman]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Gary V. Vaughan wrote:
|
| Also, unless the function is called before the arg parse loop, we should
| move
| all function definitions to after the loop so that --version, --config etc.
| are as responsive as possible ('cos the shell won't have to parse the
| funcs it
| doesn't use before echoing and exiting).  The indentation is fubared
| though,
| so I can't tell at a glance if such a place even exists... :-/

Probably the point you are talking about is just before '  if test -z
"$show_help"; then'. Indentation? You mean there is supposed to be real
indentation in ltmain.in? it just seems to meander in and out for no
apparent reason.

Anyway, applied the attached patches, did not move any function definitions,
seems a little too far to go with an 'obvious' patch. The "...15.patch" was
applied to branch-1-5, the other to HEAD.

Good night,
Peter
- --
Peter O'Gorman - http://www.pogma.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iQCVAwUBQCJaobiDAg3OZTLPAQK/MwQAoG11mliyTah9lRzp6Z/vsk3Iw0bz/buh
lgjfh6tBPfiACs8u33PV+0jeQxV1YJbfwhce5SWyiuQiugWQd9Z67TAvD0i3bGCT
sB1PFWwYJt6vjBOhvhL6XBHsLpsx5wT14VpGpnVSZyYVlDimZyaz+hBitPOuvnI0
jFKKG9g1FDc=
=x6Vy
-----END PGP SIGNATURE-----

Index: ChangeLog
2004-02-05  Peter O'Gorman  <address@hidden>

        * ltmain.in (infer_tag, win32_libid): Style changes. Rename
        infer_tag to func_infer_tag and win32_libid to func_win32_libid.
        * libtool.m4 (cygwin): rename win32_libid to func_win32_libid.

Index: libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/libtool.m4,v
retrieving revision 1.314.2.26
diff -u -3 -p -u -r1.314.2.26 libtool.m4
--- libtool.m4 3 Feb 2004 19:55:29 -0000 1.314.2.26
+++ libtool.m4 5 Feb 2004 14:45:51 -0000
@@ -2117,14 +2117,14 @@ bsdi4*)
   ;;
 
 cygwin*)
-  # win32_libid is a shell function defined in ltmain.sh
+  # func_win32_libid is a shell function defined in ltmain.sh
   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='win32_libid'
+  lt_cv_file_magic_cmd='func_win32_libid'
   ;;
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # win32_libid shell function, so use a weaker test based on 'objdump'.
+  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
   lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: 
i386)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;
Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/ltmain.in,v
retrieving revision 1.334.2.22
diff -u -3 -p -u -r1.334.2.22 ltmain.in
--- ltmain.in 4 Feb 2004 14:25:55 -0000 1.334.2.22
+++ ltmain.in 5 Feb 2004 14:45:52 -0000
@@ -119,10 +119,13 @@ o2lo="s/\\.${objext}\$/.lo/"
 # Shell function definitions:
 # This seems to be the best place for them
 
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
 # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.
-win32_libid () {
+func_win32_libid () {
   win32_libid_type="unknown"
   win32_fileres=`file -L $1 2>/dev/null`
   case $win32_fileres in
@@ -156,12 +159,13 @@ win32_libid () {
 }
 
 
-
-infer_tag () {
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base compile
-    # command doesn't match the default compiler.
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag () {
     if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=
       for arg in $CC; do
@@ -580,7 +584,7 @@ if test -z "$show_help"; then
       ;;
     esac
 
-    infer_tag $base_compile
+    func_infer_tag $base_compile
 
     for arg in $later; do
       case $arg in
@@ -928,7 +932,7 @@ EOF
     vinfo=
     vinfo_number=no
 
-    infer_tag $base_compile
+    func_infer_tag $base_compile
 
     # We need to know -static, to get the right output filenames.
     for arg

Index: ChangeLog
2004-02-05  Peter O'Gorman  <address@hidden>

        * ltmain.in (infer_tag, win32_libid): Style changes. Rename
        infer_tag to func_infer_tag and win32_libid to func_win32_libid.
        * m4/libtool.m4 (cygwin): rename win32_libid to func_win32_libid.

Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/ltmain.in,v
retrieving revision 1.371
diff -u -3 -p -u -r1.371 ltmain.in
--- ltmain.in 4 Feb 2004 14:39:02 -0000 1.371
+++ ltmain.in 5 Feb 2004 14:36:56 -0000
@@ -119,10 +119,13 @@ o2lo="s/\\.${objext}\$/.lo/"
 # Shell function definitions:
 # This seems to be the best place for them
 
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
 # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.
-win32_libid () {
+func_win32_libid () {
   win32_libid_type="unknown"
   win32_fileres=`file -L $1 2>/dev/null`
   case $win32_fileres in
@@ -157,11 +160,13 @@ win32_libid () {
 
 
 
-infer_tag () {
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base compile
-    # command doesn't match the default compiler.
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag () {
     if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=
       for arg in $CC; do
@@ -567,7 +572,7 @@ exec_cmd=
       ;;
     esac
     
-    infer_tag $base_compile
+    func_infer_tag $base_compile
 
     for arg in $later; do
       case $arg in
@@ -926,7 +931,7 @@ EOF
     vinfo=
     vinfo_number=no
 
-    infer_tag $base_compile
+    func_infer_tag $base_compile
 
     # We need to know -static, to get the right output filenames.
     for arg
Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.36
diff -u -3 -p -u -r1.36 libtool.m4
--- m4/libtool.m4 31 Jan 2004 12:03:29 -0000 1.36
+++ m4/libtool.m4 5 Feb 2004 14:36:57 -0000
@@ -2546,13 +2546,13 @@ bsdi4*)
   ;;
 
 cygwin*)
-  # win32_libid is a shell function defined in ltmain.sh
+  # func_win32_libid is a shell function defined in ltmain.sh
   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='win32_libid'
+  lt_cv_file_magic_cmd='func_win32_libid'
   ;;
 
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # win32_libid shell function, so use a weaker test based on 'objdump'.
+  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
 mingw* | pw32*)
   lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: 
i386)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'