[SCM] GNU Libtool branch, master, updated. v2.2.6-116-g94537d1

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  94537d111dcd64b0937ffe36dda485f794b47fbb (commit)
      from  f4c14adc49a89beccbecb6177c8fae4d13040b9d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 94537d111dcd64b0937ffe36dda485f794b47fbb
Author: Rainer Emrich <address@hidden>
Date:   Tue May 5 22:51:03 2009 +0200

    Fix cross compilation for HPPA/64 with a BSD file command.
    
    * libltdl/m4/libtool.m4 (_LT_CHECK_MAGIC_METHOD)
    [hpux10.20*, hpux11*, !ia64] <lt_cv_deplibs_check_method>:
    Match the dot in `PA-RISC 2.0' literally.  Adjust hppa*64*
    pattern to also match BSD `file' output, used in cross
    compilation setups.
    * THANKS: Update.
    Report and initial patch by Rainer Emrich, refined by Peter
    Rosin.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |   14 ++++++++++++++
 THANKS                |    1 +
 libltdl/m4/libtool.m4 |    4 ++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 862860a..b01a42f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-05-05  Rainer Emrich  <address@hidden>  (tiny change)
+           Peter Rosin  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Fix cross compilation for HPPA/64 with a BSD file command.
+       * libltdl/m4/libtool.m4 (_LT_CHECK_MAGIC_METHOD)
+       [hpux10.20*, hpux11*, !ia64] <lt_cv_deplibs_check_method>:
+       Match the dot in `PA-RISC 2.0' literally.  Adjust hppa*64*
+       pattern to also match BSD `file' output, used in cross
+       compilation setups.
+       * THANKS: Update.
+       Report and initial patch by Rainer Emrich, refined by Peter
+       Rosin.
+
 2009-05-05  Ralf Wildenhues  <address@hidden>
 
        libtoolize: ignore trailing junk on scriptversion line.
diff --git a/THANKS b/THANKS
index d16133b..f9c7a86 100644
--- a/THANKS
+++ b/THANKS
@@ -132,6 +132,7 @@
   Peter Eisentraut             address@hidden
   Peter Jeremy                 address@hidden
   Peter Kjellerstedt           address@hidden
+  Rainer Emrich                        address@hidden
   Rainer Orth                  address@hidden
   Rainer Tammer                        address@hidden
   Ralf Menzel                  address@hidden
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 65be165..8af17a8 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -2992,11 +2992,11 @@ hpux10.20* | hpux11*)
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     ;;
   hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) 
shared object file - PA-RISC [0-9].[0-9]']
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ 
-][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC 
[0-9]\.[0-9]']
     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    lt_cv_deplibs_check_method='file_magic 
(s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_deplibs_check_method='file_magic 
(s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac


hooks/post-receive
-- 
GNU Libtool