Re: [PATCH] remove dead code from AC_DEPLIBS_CHECK_METHOD

[Scott James Remnant]

On Thu, 2003-10-02 at 16:00, Gary V. Vaughan wrote:

> Scott James Remnant wrote:
> > A good rule of thumb is probably therefore if an arch goes for more than
> > 6 months, or one significant release without getting the change to
> > pass_all backed out again then the dead code can be removed.
> 
> > It changes no functionality, these architectures have been using
> > pass_all for some time.
> 
> lt_cv_file_magic_test_file is only used when lt_cvs_deplibs_check_method is 
> file_magic, so you can prune more aggressively.
> 
I was fairly sure this was the case, but found one or two where the
assignment of lt_cv_file_magic_test_file had been left even though
lt_cv_deplibs_check_method had been set to pass_all; "solaris*" springs
to 

Erring on the side of caution seemed a better bet for the first try.

> I agree to remove the stuff that was already pass_all for libtool-1-5 if you
> resubmit with the extra tidying.
> 
Attached.

Scott
-- 
Have you ever, ever felt like this?
Had strange things happen?  Are you going round the twist?

diff -ruNp libtool-1.5~/ChangeLog libtool-1.5/ChangeLog
--- libtool-1.5~/ChangeLog      2003-04-14 23:48:00.000000000 +0100
+++ libtool-1.5/ChangeLog       2003-10-02 17:00:30.000000000 +0100
@@ -0,0 +1,5 @@
+2003-09-30  Scott James Remnant  <address@hidden>
+
+       * libtool.m4 (AC_DEPLIBS_CHECK_METHOD): Remove dead code
+       for platforms that have been using pass_all for some time now.
+
diff -ruNp libtool-1.5~/libtool.m4 libtool-1.5/libtool.m4
--- libtool-1.5~/libtool.m4     2003-04-14 22:58:23.000000000 +0100
+++ libtool-1.5/libtool.m4      2003-10-02 17:02:25.000000000 +0100
@@ -2091,17 +2091,6 @@ cygwin* | mingw* | pw32*)
   ;;
 
 darwin* | rhapsody*)
-  # this will be overwritten by pass_all, but leave it in just in case
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared 
library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[[012]])
-    
lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2144,23 +2133,12 @@ hpux10.20* | hpux11*)
   ;;
 
 irix5* | irix6* | nonstopux*)
-  case $host_os in
-  irix5* | nonstopux*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - 
version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] 
dynamic lib MIPS - version 1"
-    ;;
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
   esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2205,9 +2183,6 @@ openbsd*)
   ;;
 
 osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2217,7 +2192,6 @@ sco3.2v5*)
 
 solaris*)
   lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
   ;;
 
 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)

signature.asc
Description: This is a digitally signed message part