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 <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 862860ad9f8f6910774c2bfa3f68f6b42a9dd8ff..b01a42f76cd654f43a6a592b641beda6ecaaa517 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-05-05  Rainer Emrich  <r.emrich@de.tecosim.com>  (tiny change)
+           Peter Rosin  <peda@lysator.liu.se>
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       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  <Ralf.Wildenhues@gmx.de>
 
        libtoolize: ignore trailing junk on scriptversion line.

diff --git a/THANKS b/THANKS
index d16133bc1cea5722ed4365c29f0a1f9f7414d945..f9c7a8671b4aff3c40f56294059b7db39caf1343 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -132,6 +132,7 @@
   Peter Eisentraut             peter_e@gmx.net
   Peter Jeremy                 peterjeremy@optushome.com.au
   Peter Kjellerstedt           peter.kjellerstedt@axis.com
+  Rainer Emrich                        r.emrich@de.tecosim.com
   Rainer Orth                  ro@TechFak.Uni-Bielefeld.DE
   Rainer Tammer                        tammer@tammer.net
   Ralf Menzel                  menzel@ls6.cs.uni-dortmund.de

diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 65be165e1e96c10cd79da2263c7338027e3afd6a..8af17a8f75b1d47a887f78b068e603d7ca39e0fd 100644 (file)
--- 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