From: Rainer Emrich Date: Tue, 5 May 2009 20:51:03 +0000 (+0200) Subject: Fix cross compilation for HPPA/64 with a BSD file command. X-Git-Tag: v2.2.7b~90 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94537d111dcd64b0937ffe36dda485f794b47fbb;p=thirdparty%2Flibtool.git Fix cross compilation for HPPA/64 with a BSD file command. * libltdl/m4/libtool.m4 (_LT_CHECK_MAGIC_METHOD) [hpux10.20*, hpux11*, !ia64] : 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 --- diff --git a/ChangeLog b/ChangeLog index 862860ad9..b01a42f76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2009-05-05 Rainer Emrich (tiny change) + Peter Rosin + Ralf Wildenhues + + Fix cross compilation for HPPA/64 with a BSD file command. + * libltdl/m4/libtool.m4 (_LT_CHECK_MAGIC_METHOD) + [hpux10.20*, hpux11*, !ia64] : + 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 libtoolize: ignore trailing junk on scriptversion line. diff --git a/THANKS b/THANKS index d16133bc1..f9c7a8671 100644 --- 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 65be165e1..8af17a8f7 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